From fc224713f22ce60e7e6d90563cf7698968eb0083 Mon Sep 17 00:00:00 2001 From: Maurizio Cacace Date: Tue, 28 Feb 2023 15:36:22 +0100 Subject: [PATCH] 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 --- .dockerignore | 1 - .github/actions/before-install/action.yml | 10 +-- .github/actions/e2e/action.yml | 4 +- .github/actions/npm-check-bundle/action.yml | 8 +-- .github/actions/set-npm-tag/action.yml | 37 +++++++++++ .github/actions/setup/action.yml | 9 +-- .../actions/travis-env-var-facade/action.yml | 61 ------------------- .github/workflows/adf_alpha.yml | 10 +-- .github/workflows/cron-e2e.yml | 40 ++++++++---- .github/workflows/git-tag.yml | 32 +++++++--- .github/workflows/pull-request.yml | 28 +++++++-- .github/workflows/release.yml | 38 ++++++++---- .travis.yml | 29 --------- e2e/protractor.conf.js | 2 +- e2e/protractor/save-remote.js | 6 +- lib/cli/.npmignore | 1 - lib/content-services/.npmignore | 1 - lib/core/.npmignore | 1 - lib/insights/.npmignore | 1 - lib/process-services/.npmignore | 1 - scripts/ci/job_hooks/before_install.sh | 29 +++++---- scripts/ci/job_hooks/install.sh | 2 +- .../{travis => github}/affected-contains.sh | 2 +- .../{travis => github}/build/bumpversion.sh | 4 +- .../build/npm-check-bundles.sh | 0 scripts/{travis => github}/e2e/e2e.sh | 13 ++-- .../release/deprecate-develop-build.sh | 0 .../{travis => github}/release/docker-tag.sh | 10 +-- scripts/{travis => github}/release/git-tag.sh | 2 +- .../release/release-demoshell-docker.sh | 0 .../{travis => github}/release/release-npm.sh | 6 +- .../release/release-storybook-docker.sh | 0 .../storybook-testing/storybook-test.sh | 0 .../update/adf-same-commit-verify.js | 0 .../{travis => github}/update/pr-creator.js | 0 .../update/update-project.sh | 0 tools/tslint-rules/.npmignore | 1 - 37 files changed, 191 insertions(+), 198 deletions(-) create mode 100644 .github/actions/set-npm-tag/action.yml delete mode 100644 .github/actions/travis-env-var-facade/action.yml delete mode 100644 .travis.yml rename scripts/{travis => github}/affected-contains.sh (91%) rename scripts/{travis => github}/build/bumpversion.sh (78%) rename scripts/{travis => github}/build/npm-check-bundles.sh (100%) rename scripts/{travis => github}/e2e/e2e.sh (76%) rename scripts/{travis => github}/release/deprecate-develop-build.sh (100%) rename scripts/{travis => github}/release/docker-tag.sh (55%) rename scripts/{travis => github}/release/git-tag.sh (93%) rename scripts/{travis => github}/release/release-demoshell-docker.sh (100%) rename scripts/{travis => github}/release/release-npm.sh (89%) rename scripts/{travis => github}/release/release-storybook-docker.sh (100%) rename scripts/{travis => github}/storybook-testing/storybook-test.sh (100%) rename scripts/{travis => github}/update/adf-same-commit-verify.js (100%) rename scripts/{travis => github}/update/pr-creator.js (100%) rename scripts/{travis => github}/update/update-project.sh (100%) diff --git a/.dockerignore b/.dockerignore index d7673dbfac..daeaf46f0e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,7 +17,6 @@ demo-shell/resources/ /angular.json /desktop.ini /cspell.json -/.travis.yml /CODE_OF_CONDUCT.md /.stylelintignore /ALFRESCOCORS.md diff --git a/.github/actions/before-install/action.yml b/.github/actions/before-install/action.yml index 4e85ebc1a6..e022875025 100644 --- a/.github/actions/before-install/action.yml +++ b/.github/actions/before-install/action.yml @@ -8,7 +8,7 @@ inputs: default: 'false' runs: using: "composite" - steps: + steps: - name: Before install if: ${{ ! env.ACT }} shell: bash @@ -22,7 +22,7 @@ runs: echo "GIT_HASH=$(git rev-parse HEAD)"; echo "BASE_HASH=$(git merge-base origin/${GITHUB_BASE_REF} 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 "BUILD_OPTS=--configuration production"; echo CI_FORCE_RUN=false; @@ -35,7 +35,7 @@ runs: run: | echo "Setting up CI to run with commit flag [affected:*] flag." echo "BREAK_ACTION=true" >> $GITHUB_ENV - + - name: ci:force flag parser shell: bash if: ${{ contains(github.event.head_commit.message , '[ci:force]') }} @@ -76,8 +76,8 @@ runs: - name: SCHEDULE event if: ${{ github.event_name == 'schedule' }} shell: bash - env: - EV_NAME: ${{ github.event_name }} + env: + EV_NAME: ${{ github.event_name }} run: | echo "Setting up CI to run on SCHEDULE" echo "NX_CALCULATION_FLAGS=--all" >> $GITHUB_ENV diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml index 186596d35f..15b3336730 100644 --- a/.github/actions/e2e/action.yml +++ b/.github/actions/e2e/action.yml @@ -149,9 +149,9 @@ runs: export DISPLAY=:99 chromedriver --url-base=/wd/hub & 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 - bash ./scripts/travis/e2e/e2e.sh "$E2E_TEST_ID" || exit 1 + bash ./scripts/github/e2e/e2e.sh "$E2E_TEST_ID" || exit 1 fi - name: upload artifacts on gh diff --git a/.github/actions/npm-check-bundle/action.yml b/.github/actions/npm-check-bundle/action.yml index edd2491b5b..f449ed7a07 100644 --- a/.github/actions/npm-check-bundle/action.yml +++ b/.github/actions/npm-check-bundle/action.yml @@ -11,8 +11,8 @@ runs: using: "composite" steps: - - name: load "TRAVIS_EVENT_TYPE" - uses: ./.github/actions/travis-env-var-facade + - name: load "NPM TAG" + uses: ./.github/actions/set-npm-tag with: branch_name: ${{ inputs.branch_name }} - name: check npm bundle @@ -22,7 +22,7 @@ runs: if [[ -z $TAG_NPM ]]; then echo "TAG_NPM not set, aborting" exit 1 - fi + fi ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version) echo "check bundle on TAG_NPM='${TAG_NPM}' and ADF_VERSION='${ADF_VERSION}'" - ./scripts/travis/build/npm-check-bundles.sh -v ${ADF_VERSION} \ No newline at end of file + ./scripts/github/build/npm-check-bundles.sh -v ${ADF_VERSION} diff --git a/.github/actions/set-npm-tag/action.yml b/.github/actions/set-npm-tag/action.yml new file mode 100644 index 0000000000..7776148628 --- /dev/null +++ b/.github/actions/set-npm-tag/action.yml @@ -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 diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 1c42bd1d6f..25d92af0be 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -50,13 +50,8 @@ runs: key: ${{ runner.os }}-pip- restore-keys: | ${{ runner.os }} -# ENV LOAD - - name: load .travis.yml env.global variables - 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: load "NPM TAG" + uses: ./.github/actions/set-npm-tag - name: before install script uses: ./.github/actions/before-install with: diff --git a/.github/actions/travis-env-var-facade/action.yml b/.github/actions/travis-env-var-facade/action.yml deleted file mode 100644 index 226c6e82c4..0000000000 --- a/.github/actions/travis-env-var-facade/action.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/.github/workflows/adf_alpha.yml b/.github/workflows/adf_alpha.yml index 4359b34c99..893f0c8886 100644 --- a/.github/workflows/adf_alpha.yml +++ b/.github/workflows/adf_alpha.yml @@ -33,11 +33,11 @@ env: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_BRANCH: ${{ github.ref_name }} GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} - TRAVIS_BUILD_DIR: ${{ github.workspace }} - TRAVIS_COMMIT: ${{ github.sha }} + GH_BUILD_DIR: ${{ github.workspace }} + GH_COMMIT: ${{ github.sha }} BUILD_ID: ${{ github.run_id }} - TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} - TRAVIS_BUILD_NUMBER: ${{ github.run_id }} + GH_RUN_NUMBER: ${{ github.run_attempt }} + GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} 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 * * *' }} run: | 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 }} diff --git a/.github/workflows/cron-e2e.yml b/.github/workflows/cron-e2e.yml index 28a03016da..942ddbdf8e 100644 --- a/.github/workflows/cron-e2e.yml +++ b/.github/workflows/cron-e2e.yml @@ -2,17 +2,19 @@ name: "cron e2e daily" on: schedule: - - cron: '0 12 * * *' + - cron: '0 12 * * *' env: + BASE_REF: ${{ github.base_ref }} + HEAD_REF: ${{ github.head_ref }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_BRANCH: ${{ github.ref_name }} - TRAVIS_BUILD_DIR: ${{ github.workspace }} - TRAVIS_COMMIT: ${{ github.sha }} + GH_BUILD_DIR: ${{ github.workspace }} + GH_COMMIT: ${{ github.sha }} BUILD_ID: ${{ github.run_id }} - TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} - TRAVIS_BUILD_NUMBER: github-run-${{ github.run_id }} + GH_RUN_NUMBER: ${{ github.run_attempt }} + GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} @@ -21,9 +23,9 @@ env: E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_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 }} - URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} + URL_HOST_ADF: "http://localhost:4200" IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} 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 }} HR_USER: ${{ secrets.HR_USER }} HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }} - NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} - NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} + SMART_RUNNER_PATH: ".protractor-smartrunner" + 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_PASSWORD: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} - DOCKER_REPOSITORY_DOMAIN: ${{ secrets.DOCKER_REPOSITORY_DOMAIN }} DOCKER_REPOSITORY_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" 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: run-e2e: diff --git a/.github/workflows/git-tag.yml b/.github/workflows/git-tag.yml index d29018450c..5405ff3c03 100644 --- a/.github/workflows/git-tag.yml +++ b/.github/workflows/git-tag.yml @@ -19,11 +19,11 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_BRANCH: ${{ github.ref_name }} - TRAVIS_BUILD_DIR: ${{ github.workspace }} - TRAVIS_COMMIT: ${{ github.sha }} + GH_BUILD_DIR: ${{ github.workspace }} + GH_COMMIT: ${{ github.sha }} BUILD_ID: ${{ github.run_id }} - TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} - TRAVIS_BUILD_NUMBER: ${{ github.run_id }} + GH_RUN_NUMBER: ${{ github.run_attempt }} + GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} @@ -32,9 +32,9 @@ env: E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_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 }} - URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} + URL_HOST_ADF: "http://localhost:4200" IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} 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_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" - NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} - NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} - GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} + 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: @@ -92,5 +104,5 @@ jobs: - name: "Release tag" run: | 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 }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index bd68af8f06..1da5a3337a 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -31,11 +31,11 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_BRANCH: ${{ github.ref_name }} - TRAVIS_BUILD_DIR: ${{ github.workspace }} - TRAVIS_COMMIT: ${{ github.sha }} + GH_BUILD_DIR: ${{ github.workspace }} + GH_COMMIT: ${{ github.sha }} BUILD_ID: ${{ github.run_id }} - TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} - TRAVIS_BUILD_NUMBER: ${{ github.run_id }} + GH_RUN_NUMBER: ${{ github.run_attempt }} + GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} @@ -44,9 +44,9 @@ env: E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }} E2E_ADMIN_EMAIL_IDENTITY: ${{ secrets.E2E_ADMIN_EMAIL_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 }} - URL_HOST_ADF: ${{ secrets.URL_HOST_ADF }} + URL_HOST_ADF: "http://localhost:4200" IDENTITY_ADMIN_EMAIL: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} IDENTITY_ADMIN_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} 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_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" 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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa87a68fd3..2441c12e8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,11 +22,11 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} GITHUB_BRANCH: ${{ github.ref_name }} - TRAVIS_BUILD_DIR: ${{ github.workspace }} - TRAVIS_COMMIT: ${{ github.sha }} + GH_BUILD_DIR: ${{ github.workspace }} + GH_COMMIT: ${{ github.sha }} BUILD_ID: ${{ github.run_id }} - TRAVIS_RUN_NUMBER: ${{ github.run_attempt }} - TRAVIS_BUILD_NUMBER: ${{ github.run_id }} + GH_RUN_NUMBER: ${{ github.run_attempt }} + GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} @@ -37,7 +37,7 @@ env: E2E_ADMIN_PASSWORD_IDENTITY: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} USERNAME_ADF: ${{ secrets.E2E_USERNAME }} 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_PASSWORD: ${{ secrets.E2E_ADMIN_PASSWORD_IDENTITY }} 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_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" - NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }} - NPM_REGISTRY_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} + 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 jobs: setup: @@ -110,8 +122,8 @@ jobs: - name: release Demoshell docker run: | nx build demoshell --configuration production - . ./scripts/travis/release/docker-tag.sh - ./scripts/travis/release/release-demoshell-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} + . ./scripts/github/release/docker-tag.sh + ./scripts/github/release/release-demoshell-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} release-storybook: needs: [setup] @@ -137,8 +149,8 @@ jobs: - name: release Storybook docker run: | nx run stories:build-storybook --configuration ci - . ./scripts/travis/release/docker-tag.sh - ./scripts/travis/release/release-storybook-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} + . ./scripts/github/release/docker-tag.sh + ./scripts/github/release/release-storybook-docker.sh ${{ steps.set-dryrun.outputs.dryrun }} release-npm: needs: [setup] @@ -176,11 +188,11 @@ jobs: - name: build libraries run: | 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 $NX_CALCULATION_FLAGS --target=pretheme - 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: needs: [release-npm] diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c80f8993b3..0000000000 --- a/.travis.yml +++ /dev/null @@ -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 diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 099800939e..bd0356aea0 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -15,7 +15,7 @@ const argv = require('yargs').argv; const width = 1657, height = 1657; 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) { require('dotenv').config({ path: ENV_FILE }); diff --git a/e2e/protractor/save-remote.js b/e2e/protractor/save-remote.js index dd5eb49c08..4ebf4c262e 100644 --- a/e2e/protractor/save-remote.js +++ b/e2e/protractor/save-remote.js @@ -5,12 +5,12 @@ const TestConfig = require('../test.config'); const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; function buildNumber() { - let buildNumber = process.env.TRAVIS_BUILD_NUMBER; + let buildNumber = process.env.GH_BUILD_NUMBER; 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) { diff --git a/lib/cli/.npmignore b/lib/cli/.npmignore index 4620fb1ec0..4568960358 100644 --- a/lib/cli/.npmignore +++ b/lib/cli/.npmignore @@ -3,7 +3,6 @@ npm-debug.log .npmrc /.editorconfig -/.travis.yml /*.json /.npmignore diff --git a/lib/content-services/.npmignore b/lib/content-services/.npmignore index 6bc46c49f3..245afc2304 100644 --- a/lib/content-services/.npmignore +++ b/lib/content-services/.npmignore @@ -3,7 +3,6 @@ npm-debug.log .npmrc /.editorconfig -/.travis.yml /*.json /karma-test-shim.js /karma.conf.js diff --git a/lib/core/.npmignore b/lib/core/.npmignore index acd3105bd4..3e9d87d286 100644 --- a/lib/core/.npmignore +++ b/lib/core/.npmignore @@ -3,7 +3,6 @@ npm-debug.log .npmrc /.editorconfig -/.travis.yml /*.json /karma-test-shim.js /karma.conf.js diff --git a/lib/insights/.npmignore b/lib/insights/.npmignore index 4bc9bd8778..6747b5501c 100644 --- a/lib/insights/.npmignore +++ b/lib/insights/.npmignore @@ -3,7 +3,6 @@ npm-debug.log .npmrc /.editorconfig -/.travis.yml /*.json /karma-test-shim.js /karma.conf.js diff --git a/lib/process-services/.npmignore b/lib/process-services/.npmignore index 4c05275930..96ea58a926 100644 --- a/lib/process-services/.npmignore +++ b/lib/process-services/.npmignore @@ -3,7 +3,6 @@ npm-debug.log .npmrc /.editorconfig -/.travis.yml /*.json /karma-test-shim.js /karma.conf.js diff --git a/scripts/ci/job_hooks/before_install.sh b/scripts/ci/job_hooks/before_install.sh index 02a170851d..736260eef6 100755 --- a/scripts/ci/job_hooks/before_install.sh +++ b/scripts/ci/job_hooks/before_install.sh @@ -14,21 +14,22 @@ export GIT_HASH=$(git rev-parse HEAD) # 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_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") ######################################################################################### -# 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 --------------------------------------------------------------- - if [[ "$TRAVIS_BRANCH" =~ ^master(-patch.*)?$ ]]; then + BRANCH=${GITHUB_REF##*/} + if [[ "$BRANCH" =~ ^master(-patch.*)?$ ]]; then # into master(-patch*) export NX_CALCULATION_FLAGS="--all" export BUILD_OPTS="--configuration production" - elif [[ "$TRAVIS_BRANCH" =~ ^develop-patch.*$ ]]; then + elif [[ "$BRANCH" =~ ^develop-patch.*$ ]]; then # into develop-patch* echo -e "\e[32mSetting up CI jobs for patch version creation.\e[0m" 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 BUILD_OPTS="--configuration production" fi -elif [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then +elif [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then # 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" -elif [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then +elif [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then # Settings for Cron ----------------------------------------------------------------- export NX_CALCULATION_FLAGS="--all" export BUILD_OPTS="--configuration production" @@ -50,20 +51,18 @@ else # Settings for API ------------------------------------------------------------------ export NX_CALCULATION_FLAGS="--all" 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 # Settings for S3 caching ------------------------------------------------------------- pip install --user awscli -if [ "${TRAVIS_EVENT_TYPE}" == "push" ]; then +if [ "${GITHUB_EVENT_NAME}" == "push" ]; then echo "push" -elif [ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]; then +elif [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then echo "pull_request" - export BASE_HASH="origin/$TRAVIS_BRANCH" + export BASE_HASH="origin/$GITHUB_BASE_REF" source "$PARENT_DIR/partials/_ci-flags-parser.sh" -elif [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then +elif [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then echo "cron" else echo "api" diff --git a/scripts/ci/job_hooks/install.sh b/scripts/ci/job_hooks/install.sh index 3e7b42682a..3b356ffb83 100755 --- a/scripts/ci/job_hooks/install.sh +++ b/scripts/ci/job_hooks/install.sh @@ -7,7 +7,7 @@ npm ci # 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 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 # 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 diff --git a/scripts/travis/affected-contains.sh b/scripts/github/affected-contains.sh similarity index 91% rename from scripts/travis/affected-contains.sh rename to scripts/github/affected-contains.sh index 72802e3d62..1e65436534 100755 --- a/scripts/travis/affected-contains.sh +++ b/scripts/github/affected-contains.sh @@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" verifyLib=$1; cd $DIR/../../ -if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then +if [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then #echo "Affected not check in case of cron" echo true exit 0 diff --git a/scripts/travis/build/bumpversion.sh b/scripts/github/build/bumpversion.sh similarity index 78% rename from scripts/travis/build/bumpversion.sh rename to scripts/github/build/bumpversion.sh index aba1c3eccb..33c0ed4f46 100755 --- a/scripts/travis/build/bumpversion.sh +++ b/scripts/github/build/bumpversion.sh @@ -3,8 +3,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ - -if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]] +BRANCH=${GITHUB_REF##*/} +if [[ $BRANCH =~ ^develop(-patch.*)?$ ]] then echo "Replace NPM version with new Alpha tag" NEXT_VERSION=-nextalpha diff --git a/scripts/travis/build/npm-check-bundles.sh b/scripts/github/build/npm-check-bundles.sh similarity index 100% rename from scripts/travis/build/npm-check-bundles.sh rename to scripts/github/build/npm-check-bundles.sh diff --git a/scripts/travis/e2e/e2e.sh b/scripts/github/e2e/e2e.sh similarity index 76% rename from scripts/travis/e2e/e2e.sh rename to scripts/github/e2e/e2e.sh index e58e542218..2de0779f0f 100755 --- a/scripts/travis/e2e/e2e.sh +++ b/scripts/github/e2e/e2e.sh @@ -7,6 +7,7 @@ cd $DIR/../../../ BASE_DIRECTORY=$(echo "$FOLDER" | cut -d "/" -f1) verifyLib=$1; +REGEX="(repository|workflow)_dispatch" # set test-e2e params if [ -n "$2" ]; then @@ -17,31 +18,31 @@ fi 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 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 "nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain" AFFECTED_LIBS="$(nx affected:libs --base=$BASE_HASH --head=$HEAD_HASH --plain || exit 1)" 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}" fi; - if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then + if [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then echo "CRON running everything " 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" ./scripts/test-e2e-lib.sh --use-dist $e2eParams else if [[ $AFFECTED_E2E == "e2e/$FOLDER" ]]; then 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 , -)" echo "Run $FOLDER e2e based on the sha $HEAD_SHA_BRANCH with the specs: "$LIST_SPECS diff --git a/scripts/travis/release/deprecate-develop-build.sh b/scripts/github/release/deprecate-develop-build.sh similarity index 100% rename from scripts/travis/release/deprecate-develop-build.sh rename to scripts/github/release/deprecate-develop-build.sh diff --git a/scripts/travis/release/docker-tag.sh b/scripts/github/release/docker-tag.sh similarity index 55% rename from scripts/travis/release/docker-tag.sh rename to scripts/github/release/docker-tag.sh index 202c8b6119..bfc296b8e6 100755 --- a/scripts/travis/release/docker-tag.sh +++ b/scripts/github/release/docker-tag.sh @@ -2,15 +2,15 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ - -if [[ $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]]; then +BRANCH=${GITHUB_REF##*/} +if [[ $BRANCH =~ ^master(-patch.*)?$ ]]; then export TAGS=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') else - if [[ "${TRAVIS_PULL_REQUEST_BRANCH}" != "" ]]; + if [[ "${GITHUB_BASE_REF}" != "" ]]; then - export TAGS="$TRAVIS_PULL_REQUEST_BRANCH-$TRAVIS_BUILD_NUMBER" + export TAGS="${GITHUB_BASE_REF}-$GH_BUILD_NUMBER" else - export TAGS="$TRAVIS_BRANCH-$TRAVIS_BUILD_NUMBER,$TRAVIS_BRANCH" + export TAGS="$GITHUB_BASE_REF-$GH_BUILD_NUMBER,$GITHUB_BASE_REF" fi; fi; diff --git a/scripts/travis/release/git-tag.sh b/scripts/github/release/git-tag.sh similarity index 93% rename from scripts/travis/release/git-tag.sh rename to scripts/github/release/git-tag.sh index 5547373df6..fe474097d7 100755 --- a/scripts/travis/release/git-tag.sh +++ b/scripts/github/release/git-tag.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ $TRAVIS_BRANCH == "master" ]]; then +if [[ $BRANCH == "master" ]]; then VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g') else VERSION=$(npm view @alfresco/adf-core@beta version) diff --git a/scripts/travis/release/release-demoshell-docker.sh b/scripts/github/release/release-demoshell-docker.sh similarity index 100% rename from scripts/travis/release/release-demoshell-docker.sh rename to scripts/github/release/release-demoshell-docker.sh diff --git a/scripts/travis/release/release-npm.sh b/scripts/github/release/release-npm.sh similarity index 89% rename from scripts/travis/release/release-npm.sh rename to scripts/github/release/release-npm.sh index a086754174..fca96223ac 100755 --- a/scripts/travis/release/release-npm.sh +++ b/scripts/github/release/release-npm.sh @@ -5,8 +5,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR/../../../ VERSION_IN_PACKAGE_JSON=`node -p "require('./package.json')".version;`; - -if [[ $TRAVIS_BRANCH =~ ^master(-patch.*)?$ ]] +BRANCH=${GITHUB_REF##*/} +if [[ $BRANCH =~ ^master(-patch.*)?$ ]] then # Pre-release versions if [[ $VERSION_IN_PACKAGE_JSON =~ ^[0-9]*\.[0-9]*\.[0-9]*-A\.[0-9]*$ ]]; @@ -18,7 +18,7 @@ then fi fi -if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]] +if [[ $BRANCH =~ ^develop(-patch.*)?$ ]] then TAG_NPM=alpha fi diff --git a/scripts/travis/release/release-storybook-docker.sh b/scripts/github/release/release-storybook-docker.sh similarity index 100% rename from scripts/travis/release/release-storybook-docker.sh rename to scripts/github/release/release-storybook-docker.sh diff --git a/scripts/travis/storybook-testing/storybook-test.sh b/scripts/github/storybook-testing/storybook-test.sh similarity index 100% rename from scripts/travis/storybook-testing/storybook-test.sh rename to scripts/github/storybook-testing/storybook-test.sh diff --git a/scripts/travis/update/adf-same-commit-verify.js b/scripts/github/update/adf-same-commit-verify.js similarity index 100% rename from scripts/travis/update/adf-same-commit-verify.js rename to scripts/github/update/adf-same-commit-verify.js diff --git a/scripts/travis/update/pr-creator.js b/scripts/github/update/pr-creator.js similarity index 100% rename from scripts/travis/update/pr-creator.js rename to scripts/github/update/pr-creator.js diff --git a/scripts/travis/update/update-project.sh b/scripts/github/update/update-project.sh similarity index 100% rename from scripts/travis/update/update-project.sh rename to scripts/github/update/update-project.sh diff --git a/tools/tslint-rules/.npmignore b/tools/tslint-rules/.npmignore index 4d18177c17..42b34c30e7 100644 --- a/tools/tslint-rules/.npmignore +++ b/tools/tslint-rules/.npmignore @@ -6,7 +6,6 @@ temp/ test/ /.editorconfig -/.travis.yml /gulpfile.js /.npmignore