AAE-11918A - remove travis env var (#8312)

* AAE-11918 - travis_branch env removal

* AAE-11918 - travis_branch env removal

* event_type and travis_pull_request_branch  env removal

* e travis_build_dir, travis_build_number, travis_commit  env removal

* rename scripts path

* remove .travis file

* remove .travis file

* remove .travis file

* just a commit

* trying to fix e2e test

* fix e2e issue

* remove action load travis env

* with action travis env var load

* remove action travis load env vars

* remove action travis load env vars

* remove action travis load env vars

* last check

* test release flow in dry-run

* final check for review

* fix env variables

* fix env variables

* fix env variables

* remove devel flag

* revert renaming action facade

* git mv commit

* git mv commit
This commit is contained in:
Maurizio Cacace 2023-02-28 15:36:22 +01:00 committed by GitHub
parent 2bc74f012d
commit fc224713f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 191 additions and 198 deletions

View File

@ -17,7 +17,6 @@ demo-shell/resources/
/angular.json /angular.json
/desktop.ini /desktop.ini
/cspell.json /cspell.json
/.travis.yml
/CODE_OF_CONDUCT.md /CODE_OF_CONDUCT.md
/.stylelintignore /.stylelintignore
/ALFRESCOCORS.md /ALFRESCOCORS.md

View File

@ -22,7 +22,7 @@ runs:
echo "GIT_HASH=$(git rev-parse HEAD)"; echo "GIT_HASH=$(git rev-parse HEAD)";
echo "BASE_HASH=$(git merge-base origin/${GITHUB_BASE_REF} HEAD)"; echo "BASE_HASH=$(git merge-base origin/${GITHUB_BASE_REF} HEAD)";
echo "HEAD_HASH=HEAD"; echo "HEAD_HASH=HEAD";
echo "HEAD_COMMIT_HASH=${TRAVIS_PULL_REQUEST_SHA:-${TRAVIS_COMMIT}}"; echo "HEAD_COMMIT_HASH=${GH_COMMIT}";
echo "NX_CALCULATION_FLAGS=--all"; echo "NX_CALCULATION_FLAGS=--all";
echo "BUILD_OPTS=--configuration production"; echo "BUILD_OPTS=--configuration production";
echo CI_FORCE_RUN=false; echo CI_FORCE_RUN=false;

View File

@ -149,9 +149,9 @@ runs:
export DISPLAY=:99 export DISPLAY=:99
chromedriver --url-base=/wd/hub & chromedriver --url-base=/wd/hub &
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" "browser" || exit 1 bash ./scripts/github/e2e/e2e.sh "$E2E_TEST_ID" "browser" || exit 1
else else
bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" || exit 1 bash ./scripts/github/e2e/e2e.sh "$E2E_TEST_ID" || exit 1
fi fi
- name: upload artifacts on gh - name: upload artifacts on gh

View File

@ -11,8 +11,8 @@ runs:
using: "composite" using: "composite"
steps: steps:
- name: load "TRAVIS_EVENT_TYPE" - name: load "NPM TAG"
uses: ./.github/actions/travis-env-var-facade uses: ./.github/actions/set-npm-tag
with: with:
branch_name: ${{ inputs.branch_name }} branch_name: ${{ inputs.branch_name }}
- name: check npm bundle - name: check npm bundle
@ -25,4 +25,4 @@ runs:
fi fi
ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version) ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version)
echo "check bundle on TAG_NPM='${TAG_NPM}' and ADF_VERSION='${ADF_VERSION}'" echo "check bundle on TAG_NPM='${TAG_NPM}' and ADF_VERSION='${ADF_VERSION}'"
./scripts/travis/build/npm-check-bundles.sh -v ${ADF_VERSION} ./scripts/github/build/npm-check-bundles.sh -v ${ADF_VERSION}

37
.github/actions/set-npm-tag/action.yml vendored Normal file
View File

@ -0,0 +1,37 @@
name: "set npm tag"
description: "se NPM tag"
inputs:
event_name:
description: "override github.event_name"
required: false
default: ${{ github.event_name }}
branch_name:
description: "override GITHUB_REF_NAME"
required: false
default: $GITHUB_REF_NAME
runs:
using: "composite"
steps:
- name: set TAG_NPM
shell: bash
run: |
TAG_NPM="alpha"
VERSION_IN_PACKAGE_JSON=$(node -p "require('./package.json')".version)
echo "version in package.json=${VERSION_IN_PACKAGE_JSON}"
if [[ ${{ inputs.branch_name }} =~ ^master(-patch.*)?$ ]]; then
# Pre-release versions
if [[ $VERSION_IN_PACKAGE_JSON =~ ^[0-9]*\.[0-9]*\.[0-9]*-A\.[0-9]*$ ]];
then
TAG_NPM=next
# Stable major versions
else
TAG_NPM=latest
fi
fi
if [[ ${{ inputs.branch_name }} =~ ^develop(-patch.*)?$ ]]; then
TAG_NPM=alpha
fi
echo "TAG_NPM=${TAG_NPM}" >> $GITHUB_ENV

View File

@ -50,13 +50,8 @@ runs:
key: ${{ runner.os }}-pip- key: ${{ runner.os }}-pip-
restore-keys: | restore-keys: |
${{ runner.os }} ${{ runner.os }}
# ENV LOAD - name: load "NPM TAG"
- name: load .travis.yml env.global variables uses: ./.github/actions/set-npm-tag
uses: Alfresco/alfresco-build-tools/.github/actions/travis-env-load@v1.17.0
with:
yml_path: .travis.yml
- name: load "TRAVIS_EVENT_TYPE"
uses: ./.github/actions/travis-env-var-facade
- name: before install script - name: before install script
uses: ./.github/actions/before-install uses: ./.github/actions/before-install
with: with:

View File

@ -1,61 +0,0 @@
# TRAVIS_EVENT_TYPE= Indicates how the build was triggered. One of push, pull_request, api, cron
name: "travis-event-type-env-var"
description: "Mimic loading of a TRAVIS_EVENT_TYPE env var"
inputs:
event_name:
description: "override github.event_name"
required: false
default: ${{ github.event_name }}
branch_name:
description: "override GITHUB_REF_NAME"
required: false
default: $GITHUB_REF_NAME
runs:
using: "composite"
steps:
- name: Parse env global
shell: bash
run: |
echo "input branch_name='${{ inputs.branch_name }}'"
EVENT_TYPE=""
TRAVIS_PULL_REQUEST_BRANCH=""
TRAVIS_BRANCH=""
TAG_NPM="alpha"
REGEX="(repository|workflow)_dispatch"
if [[ "${{ inputs.event_name }}" == "schedule" ]]; then
EVENT_TYPE="cron";
elif [[ "${{ inputs.event_name }}" == "pull_request" ]]; then
EVENT_TYPE="pull_request";
TRAVIS_BRANCH=${GITHUB_BASE_REF}
TRAVIS_PULL_REQUEST_BRANCH=${GITHUB_BASE_REF}
elif [[ "${{ inputs.event_name }}" == "push" ]]; then
EVENT_TYPE="push";
TRAVIS_BRANCH=${GITHUB_REF##*/}
elif [[ "${{ inputs.event_name }}" =~ $REGEX ]]; then
EVENT_TYPE="api";
fi
echo "TRAVIS_EVENT_TYPE=${EVENT_TYPE}" >> $GITHUB_ENV
echo "TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}" >> $GITHUB_ENV
echo "TRAVIS_BRANCH=${TRAVIS_BRANCH}" >> $GITHUB_ENV
- name: set TAG_NPM
shell: bash
run: |
VERSION_IN_PACKAGE_JSON=$(node -p "require('./package.json')".version)
echo "version in package.json=${VERSION_IN_PACKAGE_JSON}"
if [[ ${{ inputs.branch_name }} =~ ^master(-patch.*)?$ ]]; then
# Pre-release versions
if [[ $VERSION_IN_PACKAGE_JSON =~ ^[0-9]*\.[0-9]*\.[0-9]*-A\.[0-9]*$ ]];
then
TAG_NPM=next
# Stable major versions
else
TAG_NPM=latest
fi
fi
if [[ ${{ inputs.branch_name }} =~ ^develop(-patch.*)?$ ]]; then
TAG_NPM=alpha
fi
echo "TAG_NPM=${TAG_NPM}" >> $GITHUB_ENV

View File

@ -33,11 +33,11 @@ env:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_BRANCH: ${{ github.ref_name }} GITHUB_BRANCH: ${{ github.ref_name }}
GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
TRAVIS_BUILD_DIR: ${{ github.workspace }} GH_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }} GH_COMMIT: ${{ github.sha }}
BUILD_ID: ${{ github.run_id }} BUILD_ID: ${{ github.run_id }}
TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} GH_RUN_NUMBER: ${{ github.run_attempt }}
TRAVIS_BUILD_NUMBER: ${{ github.run_id }} GH_BUILD_NUMBER: ${{ github.run_id }}
JOB_ID: ${{ github.run_id }} JOB_ID: ${{ github.run_id }}
PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }}
E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }}
@ -93,5 +93,5 @@ jobs:
if: ${{ contains(github.event.head_commit.message, '[trigger adf]') || inputs.cluster_operation == 'TRIGGER_ALPHA_ADF' || github.event.schedule == '0 12 * * *' }} if: ${{ contains(github.event.head_commit.message, '[trigger adf]') || inputs.cluster_operation == 'TRIGGER_ALPHA_ADF' || github.event.schedule == '0 12 * * *' }}
run: | run: |
npm install github-api npm install github-api
./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $TRAVIS_COMMIT -r ${{ inputs.repo_to_update }} ./scripts/github/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update }}

View File

@ -5,14 +5,16 @@ on:
- cron: '0 12 * * *' - cron: '0 12 * * *'
env: env:
BASE_REF: ${{ github.base_ref }}
HEAD_REF: ${{ github.head_ref }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_BRANCH: ${{ github.ref_name }} GITHUB_BRANCH: ${{ github.ref_name }}
TRAVIS_BUILD_DIR: ${{ github.workspace }} GH_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }} GH_COMMIT: ${{ github.sha }}
BUILD_ID: ${{ github.run_id }} BUILD_ID: ${{ github.run_id }}
TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} GH_RUN_NUMBER: ${{ github.run_attempt }}
TRAVIS_BUILD_NUMBER: github-run-${{ github.run_id }} GH_BUILD_NUMBER: ${{ github.run_id }}
JOB_ID: ${{ github.run_id }} JOB_ID: ${{ github.run_id }}
PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }}
E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }}
@ -21,9 +23,9 @@ env:
E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
USERNAME_ADF: ${{ secrets.E2E_USERNAME }} USERNAME_ADF: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }} PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }}
URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} URL_HOST_ADF: "http://localhost:4200"
IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }} AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }}
@ -39,14 +41,30 @@ env:
PASSWORD_SUPER_ADMIN_ADF: ${{ secrets.PASSWORD_SUPER_ADMIN_ADF }} PASSWORD_SUPER_ADMIN_ADF: ${{ secrets.PASSWORD_SUPER_ADMIN_ADF }}
HR_USER: ${{ secrets.HR_USER }} HR_USER: ${{ secrets.HR_USER }}
HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }} HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }}
NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} SMART_RUNNER_PATH: ".protractor-smartrunner"
NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} S3_DBP_PATH: ${{ secrets.S3_DBP_PATH }}
S3_BUILD_BUCKET_SHORT_NAME: ${{ secrets.S3_BUILD_BUCKET_SHORT_NAME }}
NODE_OPTIONS: "--max-old-space-size=5120"
DOCKER_REPOSITORY_DOMAIN: ${{ secrets.DOCKER_REPOSITORY_DOMAIN }}
DOCKER_REPOSITORY_USER: ${{ secrets.DOCKER_REPOSITORY_USER }} DOCKER_REPOSITORY_USER: ${{ secrets.DOCKER_REPOSITORY_USER }}
DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
DOCKER_REPOSITORY_DOMAIN: ${{ secrets.DOCKER_REPOSITORY_DOMAIN }}
DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook"
DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell"
NODE_OPTIONS: "--max-old-space-size=5120" REPO_OWNER: "Alfresco"
REPO_NAME: "alfresco-ng2-components"
DEMO_SHELL_DIR: "./dist/demo-shell"
STORYBOOK_DIR: "./dist/storybook/stories"
BUILT_LIBS_DIR: "./dist/libs"
NODE_MODULES_DIR: "./node_modules"
SMART_RUNNER_DIRECTORY: ".protractor-smartrunner"
SAVE_SCREENSHOT: true
REDIRECT_URI: /
BROWSER_RUN: false
MAXINSTANCES: 2
PLAYWRIGHT_WORKERS: 2
PLAYWRIGHT_STORYBOOK_E2E_HOST: http://localhost
PLAYWRIGHT_STORYBOOK_E2E_PORT: 4400
PROXY_HOST_ECM: ${{ secrets.E2E_HOST }}
jobs: jobs:
run-e2e: run-e2e:

View File

@ -19,11 +19,11 @@ env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_BRANCH: ${{ github.ref_name }} GITHUB_BRANCH: ${{ github.ref_name }}
TRAVIS_BUILD_DIR: ${{ github.workspace }} GH_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }} GH_COMMIT: ${{ github.sha }}
BUILD_ID: ${{ github.run_id }} BUILD_ID: ${{ github.run_id }}
TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} GH_RUN_NUMBER: ${{ github.run_attempt }}
TRAVIS_BUILD_NUMBER: ${{ github.run_id }} GH_BUILD_NUMBER: ${{ github.run_id }}
JOB_ID: ${{ github.run_id }} JOB_ID: ${{ github.run_id }}
PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }}
E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }}
@ -32,9 +32,9 @@ env:
E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
USERNAME_ADF: ${{ secrets.E2E_USERNAME }} USERNAME_ADF: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }} PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }}
URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} URL_HOST_ADF: "http://localhost:4200"
IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }} AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }}
@ -59,9 +59,21 @@ env:
DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook"
DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell"
NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} REPO_OWNER: "Alfresco"
NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} REPO_NAME: "alfresco-ng2-components"
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} DEMO_SHELL_DIR: "./dist/demo-shell"
STORYBOOK_DIR: "./dist/storybook/stories"
BUILT_LIBS_DIR: "./dist/libs"
NODE_MODULES_DIR: "./node_modules"
SMART_RUNNER_DIRECTORY: ".protractor-smartrunner"
SAVE_SCREENSHOT: true
REDIRECT_URI: /
BROWSER_RUN: false
MAXINSTANCES: 2
PLAYWRIGHT_WORKERS: 2
PLAYWRIGHT_STORYBOOK_E2E_HOST: http://localhost
PLAYWRIGHT_STORYBOOK_E2E_PORT: 4400
PROXY_HOST_ECM: ${{ secrets.E2E_HOST }}
jobs: jobs:
@ -92,5 +104,5 @@ jobs:
- name: "Release tag" - name: "Release tag"
run: | run: |
git fetch --all --quiet git fetch --all --quiet
TRAVIS_BRANCH=${GITHUB_REF##*/} ./scripts/travis/release/git-tag.sh ${{ steps.set-dryrun.outputs.dryrun }} BRANCH=${GITHUB_REF##*/} ./scripts/github/release/git-tag.sh ${{ steps.set-dryrun.outputs.dryrun }}

View File

@ -31,11 +31,11 @@ env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_BRANCH: ${{ github.ref_name }} GITHUB_BRANCH: ${{ github.ref_name }}
TRAVIS_BUILD_DIR: ${{ github.workspace }} GH_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }} GH_COMMIT: ${{ github.sha }}
BUILD_ID: ${{ github.run_id }} BUILD_ID: ${{ github.run_id }}
TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} GH_RUN_NUMBER: ${{ github.run_attempt }}
TRAVIS_BUILD_NUMBER: ${{ github.run_id }} GH_BUILD_NUMBER: ${{ github.run_id }}
JOB_ID: ${{ github.run_id }} JOB_ID: ${{ github.run_id }}
PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }}
E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }}
@ -44,9 +44,9 @@ env:
E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
USERNAME_ADF: ${{ secrets.E2E_USERNAME }} USERNAME_ADF: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }} PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }}
URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} URL_HOST_ADF: "http://localhost:4200"
IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }} AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }}
@ -71,6 +71,22 @@ env:
DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook"
DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell"
REPO_OWNER: "Alfresco"
REPO_NAME: "alfresco-ng2-components"
DEMO_SHELL_DIR: "./dist/demo-shell"
STORYBOOK_DIR: "./dist/storybook/stories"
BUILT_LIBS_DIR: "./dist/libs"
NODE_MODULES_DIR: "./node_modules"
SMART_RUNNER_DIRECTORY: ".protractor-smartrunner"
SAVE_SCREENSHOT: true
REDIRECT_URI: /
BROWSER_RUN: false
MAXINSTANCES: 2
PLAYWRIGHT_WORKERS: 2
PLAYWRIGHT_STORYBOOK_E2E_HOST: http://localhost
PLAYWRIGHT_STORYBOOK_E2E_PORT: 4400
PROXY_HOST_ECM: ${{ secrets.E2E_HOST }}
jobs: jobs:

View File

@ -22,11 +22,11 @@ env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
GITHUB_BRANCH: ${{ github.ref_name }} GITHUB_BRANCH: ${{ github.ref_name }}
TRAVIS_BUILD_DIR: ${{ github.workspace }} GH_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }} GH_COMMIT: ${{ github.sha }}
BUILD_ID: ${{ github.run_id }} BUILD_ID: ${{ github.run_id }}
TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} GH_RUN_NUMBER: ${{ github.run_attempt }}
TRAVIS_BUILD_NUMBER: ${{ github.run_id }} GH_BUILD_NUMBER: ${{ github.run_id }}
JOB_ID: ${{ github.run_id }} JOB_ID: ${{ github.run_id }}
PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }}
E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }}
@ -37,7 +37,7 @@ env:
E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
USERNAME_ADF: ${{ secrets.E2E_USERNAME }} USERNAME_ADF: ${{ secrets.E2E_USERNAME }}
PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }} PASSWORD_ADF: ${{ secrets.E2E_PASSWORD }}
URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} URL_HOST_ADF: "http://localhost:4200"
IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }}
IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }}
AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }} AWS_S3_BUCKET_ACTIVITI_LICENSE: ${{ secrets.AWS_S3_BUCKET_ACTIVITI_LICENSE }}
@ -62,8 +62,20 @@ env:
DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} DOCKER_REPOSITORY_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }}
DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook"
DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell"
NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} REPO_OWNER: "Alfresco"
NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} REPO_NAME: "alfresco-ng2-components"
DEMO_SHELL_DIR: "./dist/demo-shell"
STORYBOOK_DIR: "./dist/storybook/stories"
BUILT_LIBS_DIR: "./dist/libs"
NODE_MODULES_DIR: "./node_modules"
SMART_RUNNER_DIRECTORY: ".protractor-smartrunner"
SAVE_SCREENSHOT: true
REDIRECT_URI: /
BROWSER_RUN: false
MAXINSTANCES: 2
PLAYWRIGHT_WORKERS: 2
PLAYWRIGHT_STORYBOOK_E2E_HOST: http://localhost
PLAYWRIGHT_STORYBOOK_E2E_PORT: 4400
jobs: jobs:
setup: setup:
@ -110,8 +122,8 @@ jobs:
- name: release Demoshell docker - name: release Demoshell docker
run: | run: |
nx build demoshell --configuration production nx build demoshell --configuration production
. ./scripts/travis/release/docker-tag.sh . ./scripts/github/release/docker-tag.sh
./scripts/travis/release/release-demoshell-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} ./scripts/github/release/release-demoshell-docker.sh ${{ steps.set-dryrun.outputs.dryrun }}
release-storybook: release-storybook:
needs: [setup] needs: [setup]
@ -137,8 +149,8 @@ jobs:
- name: release Storybook docker - name: release Storybook docker
run: | run: |
nx run stories:build-storybook --configuration ci nx run stories:build-storybook --configuration ci
. ./scripts/travis/release/docker-tag.sh . ./scripts/github/release/docker-tag.sh
./scripts/travis/release/release-storybook-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} ./scripts/github/release/release-storybook-docker.sh ${{ steps.set-dryrun.outputs.dryrun }}
release-npm: release-npm:
needs: [setup] needs: [setup]
@ -176,11 +188,11 @@ jobs:
- name: build libraries - name: build libraries
run: | run: |
set -u; set -u;
./scripts/travis/build/bumpversion.sh ./scripts/github/build/bumpversion.sh
nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" --skip-nx-cache
nx affected $NX_CALCULATION_FLAGS --target=pretheme nx affected $NX_CALCULATION_FLAGS --target=pretheme
- name: release libraries - name: release libraries
run: ./scripts/travis/release/release-npm.sh ${{ steps.set-dryrun.outputs.dryrun }} run: ./scripts/github/release/release-npm.sh ${{ steps.set-dryrun.outputs.dryrun }}
npm-check-bundle: npm-check-bundle:
needs: [release-npm] needs: [release-npm]

View File

@ -1,29 +0,0 @@
env:
global:
# REPOSITORY
- REPO_OWNER="Alfresco"
- REPO_NAME="alfresco-ng2-components"
- S3_DBP_PATH="s3://alfresco-travis-builds/adf"
- DEMO_SHELL_DIR="./dist/demo-shell"
- STORYBOOK_DIR="./dist/storybook/stories"
- BUILT_LIBS_DIR="./dist/libs"
- NODE_MODULES_DIR="./node_modules"
- SMART_RUNNER_DIRECTORY=".protractor-smartrunner"
#E2E VARIABLES
- SAVE_SCREENSHOT=true
- REDIRECT_URI=/
- BROWSER_RUN=false
- MAXINSTANCES=2
- PROXY_HOST_ECM=$E2E_HOST
- PROXY_HOST_BPM=$E2E_HOST
- HOST_SSO=$HOST_SSO
- USERNAME_ADF=$E2E_USERNAME
- PASSWORD_ADF=$E2E_PASSWORD
- IDENTITY_ADMIN_EMAIL=$E2E_ADMIN_EMAIL_IDENTITY
- IDENTITY_ADMIN_PASSWORD=$E2E_ADMIN_PASSWORD_IDENTITY
- URL_HOST_ADF="http://localhost:4200"
#PLAYWRIGHT VARIABLES
- PLAYWRIGHT_WORKERS=2
- PLAYWRIGHT_STORYBOOK_E2E_HOST=http://localhost
- PLAYWRIGHT_STORYBOOK_E2E_PORT=4400

View File

@ -15,7 +15,7 @@ const argv = require('yargs').argv;
const width = 1657, height = 1657; const width = 1657, height = 1657;
const ENV_FILE = process.env.ENV_FILE; const ENV_FILE = process.env.ENV_FILE;
const GROUP_SUFFIX = process.env.PREFIX || process.env.TRAVIS_BUILD_NUMBER || 'adf'; const GROUP_SUFFIX = process.env.PREFIX || process.env.GH_BUILD_NUMBER || 'adf';
if (ENV_FILE) { if (ENV_FILE) {
require('dotenv').config({ path: ENV_FILE }); require('dotenv').config({ path: ENV_FILE });

View File

@ -5,12 +5,12 @@ const TestConfig = require('../test.config');
const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility;
function buildNumber() { function buildNumber() {
let buildNumber = process.env.TRAVIS_BUILD_NUMBER; let buildNumber = process.env.GH_BUILD_NUMBER;
if (!buildNumber) { if (!buildNumber) {
process.env.TRAVIS_BUILD_NUMBER = Date.now(); process.env.GH_BUILD_NUMBER = Date.now();
} }
return process.env.TRAVIS_BUILD_NUMBER; return process.env.GH_BUILD_NUMBER;
} }
async function uploadScreenshot(retryCount, suffixFileName) { async function uploadScreenshot(retryCount, suffixFileName) {

View File

@ -3,7 +3,6 @@ npm-debug.log
.npmrc .npmrc
/.editorconfig /.editorconfig
/.travis.yml
/*.json /*.json
/.npmignore /.npmignore

View File

@ -3,7 +3,6 @@ npm-debug.log
.npmrc .npmrc
/.editorconfig /.editorconfig
/.travis.yml
/*.json /*.json
/karma-test-shim.js /karma-test-shim.js
/karma.conf.js /karma.conf.js

View File

@ -3,7 +3,6 @@ npm-debug.log
.npmrc .npmrc
/.editorconfig /.editorconfig
/.travis.yml
/*.json /*.json
/karma-test-shim.js /karma-test-shim.js
/karma.conf.js /karma.conf.js

View File

@ -3,7 +3,6 @@ npm-debug.log
.npmrc .npmrc
/.editorconfig /.editorconfig
/.travis.yml
/*.json /*.json
/karma-test-shim.js /karma-test-shim.js
/karma.conf.js /karma.conf.js

View File

@ -3,7 +3,6 @@ npm-debug.log
.npmrc .npmrc
/.editorconfig /.editorconfig
/.travis.yml
/*.json /*.json
/karma-test-shim.js /karma-test-shim.js
/karma.conf.js /karma.conf.js

View File

@ -14,21 +14,22 @@ export GIT_HASH=$(git rev-parse HEAD)
# Settings for Nx --------------------------------------------------------------------- # Settings for Nx ---------------------------------------------------------------------
export BASE_HASH="$(git merge-base origin/"$TRAVIS_BRANCH" HEAD)" export BASE_HASH="$(git merge-base origin/"$GITHUB_BASE_REF" HEAD)"
export HEAD_HASH="HEAD" export HEAD_HASH="HEAD"
export HEAD_COMMIT_HASH=${TRAVIS_PULL_REQUEST_SHA:-${TRAVIS_COMMIT}} export HEAD_COMMIT_HASH=${GH_COMMIT}
export COMMIT_MESSAGE=$(git log --format=%B -n 1 "$HEAD_COMMIT_HASH") export COMMIT_MESSAGE=$(git log --format=%B -n 1 "$HEAD_COMMIT_HASH")
######################################################################################### #########################################################################################
# Settings based of Travis event type # Settings based of Github event type
######################################################################################### #########################################################################################
if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then if [ "${GITHUB_EVENT_NAME}" == "push" ]; then
# Settings for merges --------------------------------------------------------------- # Settings for merges ---------------------------------------------------------------
if [[ "$TRAVIS_BRANCH" =~ ^master(-patch.*)?$ ]]; then BRANCH=${GITHUB_REF##*/}
if [[ "$BRANCH" =~ ^master(-patch.*)?$ ]]; then
# into master(-patch*) # into master(-patch*)
export NX_CALCULATION_FLAGS="--all" export NX_CALCULATION_FLAGS="--all"
export BUILD_OPTS="--configuration production" export BUILD_OPTS="--configuration production"
elif [[ "$TRAVIS_BRANCH" =~ ^develop-patch.*$ ]]; then elif [[ "$BRANCH" =~ ^develop-patch.*$ ]]; then
# into develop-patch* # into develop-patch*
echo -e "\e[32mSetting up CI jobs for patch version creation.\e[0m" echo -e "\e[32mSetting up CI jobs for patch version creation.\e[0m"
export NX_CALCULATION_FLAGS="--all" export NX_CALCULATION_FLAGS="--all"
@ -38,11 +39,11 @@ if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then
export NX_CALCULATION_FLAGS="--base=$(git describe --tags $(git rev-list --tags --max-count=1)) --head=$HEAD_HASH" export NX_CALCULATION_FLAGS="--base=$(git describe --tags $(git rev-list --tags --max-count=1)) --head=$HEAD_HASH"
export BUILD_OPTS="--configuration production" export BUILD_OPTS="--configuration production"
fi fi
elif [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then elif [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
# Settings for PRs ------------------------------------------------------------------ # Settings for PRs ------------------------------------------------------------------
export NX_CALCULATION_FLAGS="--base=origin/$TRAVIS_BRANCH --head=$HEAD_HASH" export NX_CALCULATION_FLAGS="--base=origin/$GITHUB_BASE_REF --head=$HEAD_HASH"
export BUILD_OPTS="--configuration production" export BUILD_OPTS="--configuration production"
elif [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then elif [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then
# Settings for Cron ----------------------------------------------------------------- # Settings for Cron -----------------------------------------------------------------
export NX_CALCULATION_FLAGS="--all" export NX_CALCULATION_FLAGS="--all"
export BUILD_OPTS="--configuration production" export BUILD_OPTS="--configuration production"
@ -50,20 +51,18 @@ else
# Settings for API ------------------------------------------------------------------ # Settings for API ------------------------------------------------------------------
export NX_CALCULATION_FLAGS="--all" export NX_CALCULATION_FLAGS="--all"
export BUILD_OPTS="--configuration production" export BUILD_OPTS="--configuration production"
# In case of manual Travis run use the commit message from travis and not the one from git
COMMIT_MESSAGE=$TRAVIS_COMMIT_MESSAGE
fi fi
# Settings for S3 caching ------------------------------------------------------------- # Settings for S3 caching -------------------------------------------------------------
pip install --user awscli pip install --user awscli
if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then if [ "${GITHUB_EVENT_NAME}" == "push" ]; then
echo "push" echo "push"
elif [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then elif [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
echo "pull_request" echo "pull_request"
export BASE_HASH="origin/$TRAVIS_BRANCH" export BASE_HASH="origin/$GITHUB_BASE_REF"
source "$PARENT_DIR/partials/_ci-flags-parser.sh" source "$PARENT_DIR/partials/_ci-flags-parser.sh"
elif [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then elif [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then
echo "cron" echo "cron"
else else
echo "api" echo "api"

View File

@ -7,7 +7,7 @@ npm ci
# The adf-cli is not installed through NPM for this reason it needs to be built # The adf-cli is not installed through NPM for this reason it needs to be built
# in addition the dist folder needs to be moved as part of the node modules # in addition the dist folder needs to be moved as part of the node modules
# in this way every check like check-cs check-ps can use the adf cli # in this way every check like check-cs check-ps can use the adf cli
# the bundle is saved under node_modules also to use the same cache of travis # the bundle is saved under node_modules also to use the same cache of github
nx run cli:bundle nx run cli:bundle
# The adf-testing is not installed through NPM for this reason it needs to be built # The adf-testing is not installed through NPM for this reason it needs to be built
# in addition the dist folder needs to be moved as part of the node modules # in addition the dist folder needs to be moved as part of the node modules

View File

@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
verifyLib=$1; verifyLib=$1;
cd $DIR/../../ cd $DIR/../../
if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then if [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then
#echo "Affected not check in case of cron" #echo "Affected not check in case of cron"
echo true echo true
exit 0 exit 0

View File

@ -3,8 +3,8 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR/../../../ cd $DIR/../../../
BRANCH=${GITHUB_REF##*/}
if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]] if [[ $BRANCH =~ ^develop(-patch.*)?$ ]]
then then
echo "Replace NPM version with new Alpha tag" echo "Replace NPM version with new Alpha tag"
NEXT_VERSION=-nextalpha NEXT_VERSION=-nextalpha

View File

@ -7,6 +7,7 @@ cd $DIR/../../../
BASE_DIRECTORY=$(echo "$FOLDER" | cut -d "/" -f1) BASE_DIRECTORY=$(echo "$FOLDER" | cut -d "/" -f1)
verifyLib=$1; verifyLib=$1;
REGEX="(repository|workflow)_dispatch"
# set test-e2e params # set test-e2e params
if [ -n "$2" ]; then if [ -n "$2" ]; then
@ -17,31 +18,31 @@ fi
echo "Step1 - Verify if affected libs contains $verifyLib" echo "Step1 - Verify if affected libs contains $verifyLib"
AFFECTED_LIB=$(./scripts/travis/affected-contains.sh $verifyLib ) AFFECTED_LIB=$(./scripts/github/affected-contains.sh $verifyLib )
if [ ${AFFECTED_LIB} == true ]; then if [ ${AFFECTED_LIB} == true ]; then
echo "Step2 - $verifyLib affected... will execute e2e" echo "Step2 - $verifyLib affected... will execute e2e"
if [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
echo "Calculate affected e2e $BASE_HASH $HEAD_HASH" echo "Calculate affected e2e $BASE_HASH $HEAD_HASH"
echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain" echo "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain"
AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)" AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)"
echo "Affected libs ${AFFECTED_LIBS}" echo "Affected libs ${AFFECTED_LIBS}"
AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $TRAVIS_BRANCH -f "e2e/$FOLDER")"; AFFECTED_E2E="$(./scripts/git-util/affected-folder.sh -b $GITHUB_BASE_REF -f "e2e/$FOLDER")";
echo "Affected e2e ${AFFECTED_E2E}" echo "Affected e2e ${AFFECTED_E2E}"
fi; fi;
if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then if [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then
echo "CRON running everything " echo "CRON running everything "
fi; fi;
if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$BASE_DIRECTORY" || "${TRAVIS_EVENT_TYPE}" == "push" || "${TRAVIS_EVENT_TYPE}" == "api" || "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then if [[ $AFFECTED_LIBS =~ "testing" || $AFFECTED_LIBS =~ "$BASE_DIRECTORY" || "${GITHUB_EVENT_NAME}" == "push" || "${GITHUB_EVENT_NAME}" == "$REGEX" || "${GITHUB_EVENT_NAME}" == "schedule" ]]; then
echo "Run all e2e $FOLDER" echo "Run all e2e $FOLDER"
./scripts/test-e2e-lib.sh --use-dist $e2eParams ./scripts/test-e2e-lib.sh --use-dist $e2eParams
else if [[ $AFFECTED_E2E == "e2e/$FOLDER" ]]; then else if [[ $AFFECTED_E2E == "e2e/$FOLDER" ]]; then
echo "Run affected e2e" echo "Run affected e2e"
HEAD_SHA_BRANCH="$(git merge-base origin/$TRAVIS_BRANCH HEAD)" HEAD_SHA_BRANCH="$(git merge-base origin/$GITHUB_HEAD_REF HEAD)"
LIST_SPECS="$(git diff --name-only $HEAD_SHA_BRANCH HEAD | grep "^e2e/$FOLDER" | paste -sd , -)" LIST_SPECS="$(git diff --name-only $HEAD_SHA_BRANCH HEAD | grep "^e2e/$FOLDER" | paste -sd , -)"
echo "Run $FOLDER e2e based on the sha $HEAD_SHA_BRANCH with the specs: "$LIST_SPECS echo "Run $FOLDER e2e based on the sha $HEAD_SHA_BRANCH with the specs: "$LIST_SPECS

View File

@ -2,15 +2,15 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR/../../../ cd $DIR/../../../
BRANCH=${GITHUB_REF##*/}
if [[ $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]]; then if [[ $BRANCH =~ ^master(-patch.*)?$ ]]; then
export TAGS=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') export TAGS=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g')
else else
if [[ "${TRAVIS_PULL_REQUEST_BRANCH}" != "" ]]; if [[ "${GITHUB_BASE_REF}" != "" ]];
then then
export TAGS="$TRAVIS_PULL_REQUEST_BRANCH-$TRAVIS_BUILD_NUMBER" export TAGS="${GITHUB_BASE_REF}-$GH_BUILD_NUMBER"
else else
export TAGS="$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER,$TRAVIS_BRANCH" export TAGS="$GITHUB_BASE_REF-$GH_BUILD_NUMBER,$GITHUB_BASE_REF"
fi; fi;
fi; fi;

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [[ $TRAVIS_BRANCH == "master" ]]; then if [[ $BRANCH == "master" ]]; then
VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g')
else else
VERSION=$(npm view @alfresco/adf-core@beta version) VERSION=$(npm view @alfresco/adf-core@beta version)

View File

@ -5,8 +5,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR/../../../ cd $DIR/../../../
VERSION_IN_PACKAGE_JSON=`node -p "require('./package.json')".version;`; VERSION_IN_PACKAGE_JSON=`node -p "require('./package.json')".version;`;
BRANCH=${GITHUB_REF##*/}
if [[ $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]] if [[ $BRANCH =~ ^master(-patch.*)?$ ]]
then then
# Pre-release versions # Pre-release versions
if [[ $VERSION_IN_PACKAGE_JSON =~ ^[0-9]*\.[0-9]*\.[0-9]*-A\.[0-9]*$ ]]; if [[ $VERSION_IN_PACKAGE_JSON =~ ^[0-9]*\.[0-9]*\.[0-9]*-A\.[0-9]*$ ]];
@ -18,7 +18,7 @@ then
fi fi
fi fi
if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]] if [[ $BRANCH =~ ^develop(-patch.*)?$ ]]
then then
TAG_NPM=alpha TAG_NPM=alpha
fi fi

View File

@ -6,7 +6,6 @@ temp/
test/ test/
/.editorconfig /.editorconfig
/.travis.yml
/gulpfile.js /gulpfile.js
/.npmignore /.npmignore