From 37f04cf499c00f586abcf9bc9ecccd48f2a7c3c9 Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Mon, 9 Sep 2024 12:25:10 +0100 Subject: [PATCH] [MIGRATION] - check to update the script --- .github/workflows/pull-request.yml | 1 - .github/workflows/release-branch.yml | 47 +++++++++++++++++++++++++--- scripts/github/affected-contains.sh | 2 +- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9bf110585b..e95cdff134 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -171,7 +171,6 @@ jobs: npx nx run js-api:bundle npx nx run cli:bundle npx nx run testing:bundle - - run: npx nx print-affected $NX_CALCULATION_FLAGS - uses: ./.github/actions/upload-node-modules-and-artifacts unit-tests: diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml index 77ace1216c..b6ddd0145c 100644 --- a/.github/workflows/release-branch.yml +++ b/.github/workflows/release-branch.yml @@ -22,20 +22,57 @@ env: GH_RUN_NUMBER: ${{ github.run_attempt }} GH_BUILD_NUMBER: ${{ github.run_id }} JOB_ID: ${{ github.run_id }} + PROXY_HOST_BPM: ${{ secrets.E2E_HOST }} + E2E_IDENTITY_HOST_APA: ${{ secrets.E2E_IDENTITY_HOST_APA }} + E2E_HOST_APA: ${{ secrets.E2E_HOST_APA }} + E2E_HOST: ${{ secrets.E2E_HOST }} + E2E_USERNAME: ${{ secrets.E2E_ADMIN_EMAIL_IDENTITY }} + 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: "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 }} + HOST_SSO: ${{ secrets.HOST_SSO }} LOG_LEVEL: "ERROR" + E2E_LOG_LEVEL: "ERROR" + E2E_MODELER_USERNAME: ${{ secrets.E2E_MODELER_USERNAME }} + E2E_MODELER_PASSWORD: ${{ secrets.E2E_MODELER_PASSWORD }} + EXTERNAL_ACS_HOST: ${{ secrets.EXTERNAL_ACS_HOST }} + E2E_DEVOPS_USERNAME: ${{ secrets.E2E_DEVOPS_USERNAME }} + E2E_DEVOPS_PASSWORD: ${{ secrets.E2E_DEVOPS_PASSWORD }} + USERNAME_SUPER_ADMIN_ADF: ${{ secrets.USERNAME_SUPER_ADMIN_ADF }} + PASSWORD_SUPER_ADMIN_ADF: ${{ secrets.PASSWORD_SUPER_ADMIN_ADF }} + HR_USER: ${{ secrets.HR_USER }} + HR_USER_PASSWORD: ${{ secrets.HR_USER_PASSWORD }} + 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_STORYBOOK: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/storybook" + DOCKER_REPOSITORY: "${{ secrets.DOCKER_REPOSITORY_DOMAIN }}/alfresco/demo-shell" 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 jobs: setup: @@ -98,16 +135,16 @@ jobs: setMigrations(); - name: Build libraries run: | - npx nx affected:build $NX_CALCULATION_FLAGS --prod --skip-nx-cache - npx nx affected $NX_CALCULATION_FLAGS --target=pretheme - npx nx affected $NX_CALCULATION_FLAGS --target=build-schematics + npx nx run-many --target=build --prod --exclude="demoshell" --skip-nx-cache + npx nx run-many --target=pretheme + npx nx run-many --target=build-schematics - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 name: release libraries GH registry with: node-version-file: '.nvmrc' registry-url: 'https://npm.pkg.github.com' scope: '@alfresco' - - run: npx nx affected --target=npm-publish $NX_CALCULATION_FLAGS --tag=branch|| exit 1 + - run: npx nx run-many --target=npm-publish --tag=branch|| exit 1 env: NODE_AUTH_TOKEN: ${{ secrets.PAT_WRITE_PKG }} - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4 @@ -116,7 +153,7 @@ jobs: node-version-file: '.nvmrc' registry-url: 'https://${{ vars.NPM_REGISTRY_ADDRESS }}' scope: '@alfresco' - - run: npx nx affected --target=npm-publish $NX_CALCULATION_FLAGS --tag=branch || exit 1 + - run: npx nx run-many --target=npm-publish --tag=branch || exit 1 env: NODE_AUTH_TOKEN: ${{ secrets.NPM_REGISTRY_TOKEN }} diff --git a/scripts/github/affected-contains.sh b/scripts/github/affected-contains.sh index f1743be5bf..c0287d7845 100755 --- a/scripts/github/affected-contains.sh +++ b/scripts/github/affected-contains.sh @@ -11,7 +11,7 @@ if [ "${GITHUB_EVENT_NAME}" == "schedule" ]; then exit 0 fi isAffected=false -AFFECTED_LIBS=$(npx nx print-affected --type=lib --select=projects ${NX_CALCULATION_FLAGS} --plain) +AFFECTED_LIBS=$(npx nx show projects --affected ${NX_CALCULATION_FLAGS} --plain) #echo "Verify if affected build contains $1" #echo "Affected libs:$AFFECTED_LIBS" if [[ $AFFECTED_LIBS =~ $verifyLib ]]; then