diff --git a/.github/actions/after-e2e/action.yml b/.github/actions/after-e2e/action.yml index 0475d73974..a918a77aa4 100644 --- a/.github/actions/after-e2e/action.yml +++ b/.github/actions/after-e2e/action.yml @@ -1,30 +1,9 @@ name: "After e2e" -description: "After e2e" - -env: - storage_file: "./storage-state/AdminUserState.json" - -inputs: - id: - description: 'test suite id' - required: true - type: number - aws-access-key-id: - description: 'aws access key id' - required: true - type: string - aws-secret-access-key: - description: 'aws secret access key' - required: true - type: string - aws-region: - description: 'aws region' - required: true - type: string +description: "Runs cleanup tasks after e2e run" runs: using: "composite" steps: - name: Remove storage file shell: bash - run: rm -f ${{ env.storage_file }} + run: rm -f ./storage-state/AdminUserState.json diff --git a/.github/actions/before-e2e/action.yml b/.github/actions/before-e2e/action.yml index 947b522db7..4c981efc04 100644 --- a/.github/actions/before-e2e/action.yml +++ b/.github/actions/before-e2e/action.yml @@ -33,6 +33,7 @@ runs: - name: Check content UP shell: bash run: ./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host $APP_CONFIG_ECM_HOST -u $ADMIN_EMAIL -p $ADMIN_PASSWORD || exit 1 + - name: Download artifacts uses: ./.github/actions/download-job-artifact with: @@ -41,6 +42,7 @@ runs: aws-access-key-id: ${{ inputs.aws-access-key-id }} aws-secret-access-key: ${{ inputs.aws-secret-access-key }} aws-region: ${{ inputs.aws-region }} + - name: Replace variables in app.config.json shell: bash run: | @@ -54,6 +56,7 @@ runs: echo -e "\e[31m \_ ERROR: Variables are still present in the app.config.json file. Some of them might not have default value set.\e[0m"; exit 5; fi + - name: Update webdriver-manager shell: bash run: | diff --git a/.github/actions/before-install/action.yml b/.github/actions/before-install/action.yml index 7c9ac25a43..4b42f896c8 100644 --- a/.github/actions/before-install/action.yml +++ b/.github/actions/before-install/action.yml @@ -1,35 +1,29 @@ name: "Before install and variables setup" description: "Before install and variables setup" -inputs: - artifact: - description: 'path to the artifact to archieve (tar.bz2) and upload (like ./dist)' - required: true - type: string - output: - description: 'the S3 object to copy it to, like: s3://bucket-name/folder/whatever.tar.bz2' - required: true - type: string - runs: using: "composite" steps: - uses: ./.github/actions/setup + - name: setup S3 caching shell: bash run: | S3_DBP_PATH="s3://alfresco-travis-builds/aca" + if [ "${{ github.event_name }}" == "push" ]; then - S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME" + S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME" elif [ "${{ github.event_name }}" == "pull_request" ]; then - S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME" - echo "BASE_HASH=origin/$BRANCH_NAME" >> $GITHUB_ENV + S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME" + echo "BASE_HASH=origin/$BRANCH_NAME" >> $GITHUB_ENV elif [ "${{ github.event_name }}" == "schedule" ]; then - S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/cron" + S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/cron" else - S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/api" + S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/api" fi + echo "S3_DBP_FOLDER="$S3_DBP_ROOT_FOLDER/${{ github.run_id }}"" >> $GITHUB_ENV + - name: ADF linking if: ${{ github.event_name == 'pull_request'}} uses: ./.github/actions/adf-linking diff --git a/.github/actions/download-job-artifact/action.yml b/.github/actions/download-job-artifact/action.yml index c5c299dd5c..9d11f80f98 100644 --- a/.github/actions/download-job-artifact/action.yml +++ b/.github/actions/download-job-artifact/action.yml @@ -27,12 +27,13 @@ runs: using: "composite" steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ inputs.aws-access-key-id }} aws-secret-access-key: ${{ inputs.aws-secret-access-key }} aws-region: ${{ inputs.aws-region }} - - name: download build artifacts from s3 + + - name: Download build artifacts from s3 shell: bash run: | test ! -d ${{ inputs.output }} && mkdir -p ${{ inputs.output }} diff --git a/.github/actions/get-image-tag/action.yml b/.github/actions/get-image-tag/action.yml index d3b8f6aaa8..2705f4930f 100644 --- a/.github/actions/get-image-tag/action.yml +++ b/.github/actions/get-image-tag/action.yml @@ -14,8 +14,8 @@ runs: shell: bash run: | if [[ "${{ inputs.branch_name }}" == "master" ]]; then - TAG_VERSION="$(jq -cr '.version' < package.json)" + TAG_VERSION="$(jq -cr '.version' < package.json)" else - TAG_VERSION="${{ inputs.branch_name }}-${{ github.run_id }},{{ inputs.branch_name }}" + TAG_VERSION="${{ inputs.branch_name }}-${{ github.run_id }},{{ inputs.branch_name }}" fi echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV diff --git a/.github/actions/publish-libs/action.yml b/.github/actions/publish-libs/action.yml index 36d50730b8..7f240e5b3b 100644 --- a/.github/actions/publish-libs/action.yml +++ b/.github/actions/publish-libs/action.yml @@ -49,7 +49,7 @@ runs: - name: Publish to GH registry shell: bash - run: ./scripts/gh/npm-publish.sh "$TAG" "$DRY_RUN" + run: ${{ github.action_path }}/npm-publish.sh "$TAG" "$DRY_RUN" env: NODE_AUTH_TOKEN: ${{ inputs.github_token }} TAG: ${{ inputs.npm_tag }} @@ -64,7 +64,7 @@ runs: - name: Publish to NPM registry shell: bash - run: ./scripts/gh/npm-publish.sh "$TAG" "$DRY_RUN" + run: ${{ github.action_path }}/npm-publish.sh "$TAG" "$DRY_RUN" env: NODE_AUTH_TOKEN: ${{ inputs.npm_registry_token }} TAG: ${{ inputs.npm_tag }} diff --git a/scripts/gh/npm-publish.sh b/.github/actions/publish-libs/npm-publish.sh similarity index 100% rename from scripts/gh/npm-publish.sh rename to .github/actions/publish-libs/npm-publish.sh diff --git a/.github/actions/update-library-versions/action.yml b/.github/actions/update-library-versions/action.yml index 7ad69598f0..fde7316a87 100644 --- a/.github/actions/update-library-versions/action.yml +++ b/.github/actions/update-library-versions/action.yml @@ -22,7 +22,7 @@ runs: if [[ ${{ inputs.branch_name }} =~ ^master.*?$ ]] ; then NEW_LIBRARY_VERSION="$VERSION_IN_PACKAGE_JSON" else - NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}.${PR_NUMBER}" + NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}.${{ github.run_id }}" fi - ./scripts/gh/update-lib-versions.sh "$NEW_LIBRARY_VERSION" "${{ inputs.dry-run }}" + ${{ github.action_path }}/update-lib-versions.sh "$NEW_LIBRARY_VERSION" "${{ inputs.dry-run }}" diff --git a/scripts/gh/update-lib-versions.sh b/.github/actions/update-library-versions/update-lib-versions.sh similarity index 100% rename from scripts/gh/update-lib-versions.sh rename to .github/actions/update-library-versions/update-lib-versions.sh diff --git a/.github/actions/upload-job-artifact/action.yml b/.github/actions/upload-job-artifact/action.yml index 008ee83f61..a0761597ac 100644 --- a/.github/actions/upload-job-artifact/action.yml +++ b/.github/actions/upload-job-artifact/action.yml @@ -27,12 +27,13 @@ runs: using: "composite" steps: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v2 with: aws-access-key-id: ${{ inputs.aws-access-key-id }} aws-secret-access-key: ${{ inputs.aws-secret-access-key }} aws-region: ${{ inputs.aws-region }} - - name: upload build artifacts to s3 + + - name: Upload build artifacts to s3 shell: bash run: | tar cvfj ./s3-artifact.tmp -C ${{ inputs.artifact }} `ls ${{ inputs.artifact }}` diff --git a/.github/workflows/aca-upstream.yml b/.github/workflows/aca-upstream.yml index 7908825431..8a59871028 100644 --- a/.github/workflows/aca-upstream.yml +++ b/.github/workflows/aca-upstream.yml @@ -24,25 +24,24 @@ jobs: name: Trigger ACA Upstream runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - name: Checkout Repository + uses: actions/checkout@v3 - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version-file: '.nvmrc' - cache: 'npm' + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version-file: '.nvmrc' + cache: 'npm' - - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.0 - with: - username: ${{ vars.BOT_GITHUB_USERNAME }} - email: ${{ vars.BOT_GITHUB_EMAIL }} - global: true + - name: Configure Git Author + uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.0 + with: + username: ${{ vars.BOT_GITHUB_USERNAME }} + email: ${{ vars.BOT_GITHUB_EMAIL }} + global: true - - name: Trigger Upstream - shell: bash - run: | - npm install github-api - ./scripts/gh/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update || 'alfresco-applications' }} + - name: Trigger Upstream + shell: bash + run: | + npm install github-api + ./scripts/gh/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update || 'alfresco-applications' }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8b03e9e1dd..a7334529ab 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -166,11 +166,6 @@ jobs: with: options: "--suite=${{ matrix.e2e-suites.name }}" - uses: ./.github/actions/after-e2e - with: - id: ${{ matrix.e2e-suites.id }} - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} e2es-playwright: needs: [lint, build, unit-tests] @@ -205,11 +200,6 @@ jobs: options: "e2e/playwright/tests/folder-rules/playwright.config.ts" test-runner: playwright - uses: ./.github/actions/after-e2e - with: - id: 15 - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.AWS_REGION }} finalize: if: ${{ always() }} @@ -217,12 +207,6 @@ jobs: name: 'Finalize' runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 2 - - uses: Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v1.35.0 - - name: Check previous jobs status if: >- ${{ @@ -231,6 +215,14 @@ jobs: }} run: exit 1 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - name: Extract commit message + uses: Alfresco/alfresco-build-tools/.github/actions/get-commit-message@v1.35.0 + - name: Check ADF link shell: bash run: | diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index c63426a01a..d089ccb619 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -1,18 +1,21 @@ -on: +name: Automatic Rebase + +on: issue_comment: types: [created] -name: Automatic Rebase + jobs: rebase: name: Rebase if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') runs-on: ubuntu-latest steps: - - name: Checkout the latest code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Automatic Rebase - uses: cirrus-actions/rebase@1.3.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout the latest code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.3.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 379bd9aacd..8e8bc9987b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -120,21 +120,15 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 2 + - name: Setup node uses: actions/setup-node@v3 with: node-version-file: '.nvmrc' cache: 'npm' + - uses: ./.github/actions/setup - - name: check PR number - id: action - uses: kamatama41/get-pr-number-action@v0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: save PR number - shell: bash - run: | - echo "PR_NUMBER=${{ steps.action.outputs.number }}" >> $GITHUB_ENV + - name: publish uses: ./.github/actions/publish-libs with: diff --git a/scripts/run b/scripts/run deleted file mode 100755 index 98ca5e6aee..0000000000 --- a/scripts/run +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env node - -const path = require('path'); -const tsConfigPath = path.resolve(__dirname, 'tsconfig.json'); -const tsConfig = require(tsConfigPath); - -require('ts-node').register({ project: tsConfigPath }); -require('tsconfig-paths').register({ - project: tsConfigPath, - baseUrl: path.resolve(__dirname), - paths: tsConfig.compilerOptions.paths -}); - -const handlerParam = process.argv[2]; -const RunnerClass = require(`./npm/${handlerParam}.ts`).default; - -const runnerArgs = [...process.argv]; -runnerArgs.splice(2, 1); -const runner = new RunnerClass(runnerArgs); -runner.run(); diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json deleted file mode 100644 index 8ba610f54c..0000000000 --- a/scripts/tsconfig.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "compilerOptions": { - "outDir": "./dist/scripts", - "module": "commonjs", - "target": "es5", - "baseUrl": ".", - "sourceMap": false, - "declaration": false, - "moduleResolution": "node", - "resolveJsonModule": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "skipLibCheck": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noImplicitReturns": true, - "allowSyntheticDefaultImports": true, - "typeRoots": [ - "node_modules/@types", - "node_modules/commander/typings/index.d.ts" - ], - "lib": ["es2018", "dom"], - "types": ["node", "jasmine", "jest"], - "paths": { - "angular.json": ["../angular.json"] - } - }, - "exclude": ["node_modules"], - "angularCompilerOptions": { - "preserveWhitespaces": false - } -}