diff --git a/.github/workflows/adf_alpha.yml b/.github/workflows/adf_alpha.yml index 058aa341de..e94dee46db 100644 --- a/.github/workflows/adf_alpha.yml +++ b/.github/workflows/adf_alpha.yml @@ -15,6 +15,7 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} 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 }} BUILD_ID: ${{ github.run_id }} @@ -66,6 +67,8 @@ jobs: fetch-depth: 0 - name: Trigger Alpha ADF child build shell: bash - if: ${{ contains(github.event.head_commit.message, '[trigger adf]') || inputs.cluster_operation == 'TRIGGER_ALPHA_ADF' || github.event.schedule == '0 0 1 * *' }} - run: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v alpha -c $TRAVIS_COMMIT + if: ${{ contains(github.event.head_commit.message, '[trigger adf]') || inputs.cluster_operation == 'TRIGGER_ALPHA_ADF' || github.event.schedule == '0 11 * * *' }} + run: | + npm install github-api + ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $TRAVIS_COMMIT -d \ No newline at end of file diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 85518a5caf..5d693c4436 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -2,7 +2,7 @@ name: "cron schedule" on: schedule: - - cron: '0 0 1 * *' + - cron: '0 11 * * *' env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -52,15 +52,7 @@ jobs: run-e2e: name: run e2e uses: ./.github/workflows/pull-request.yml - secrets: inherit - - npm-check-bundle: - timeout-minutes: 10 - runs-on: ubuntu-22.04 - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - uses: ./.github/actions/npm-check-bundle + secrets: inherit adf-alpha-test: name: trigger alpha test diff --git a/scripts/travis/update/update-project.sh b/scripts/travis/update/update-project.sh index 66a8911469..c2c2197be6 100755 --- a/scripts/travis/update/update-project.sh +++ b/scripts/travis/update/update-project.sh @@ -10,14 +10,15 @@ TEMP_GENERATOR_DIR=".tmp-generator"; BRANCH_TO_CREATE="update-alfresco-dependencies" TOKEN="" PR_NUMBER="" +DRY_RUN="false" show_help() { echo "Usage: create-updatebranch.sh" echo "" echo "-t or --token: Github ouath token" echo "-p or --pr: Originating jsapi PR number" - echo "-v or --version version to update" - echo "-c or --commit The commit that the current build is testing" + echo "-v or --version version to update" + echo "-d or --dry-run: The script won't execute critical operation, just simulate them" } set_token() { @@ -36,6 +37,12 @@ set_commit() { COMMIT=$1 } +set_dryrun() { + + DRY_RUN="true" + +} + update_dependency() { PKG=$1 PKG_VERSION=$(npm view $PKG@$VERSION version) @@ -112,6 +119,7 @@ while [[ $1 == -* ]]; do -p|--pr) set_pr $2; shift; shift;; -v|--version) version $2; shift 2;; -c|--commit) set_commit $2; shift 2;; + -d|--dry-run) set_dryrun $2; shift; shift;; -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; esac done @@ -133,9 +141,13 @@ isSameADFSha=$(node $BUILD_PIPELINE_DIR/adf-same-commit-verify.js --token=$TOKEN if [ "$isSameADFSha" = 'true' ]; then echo 'ADF sha is the same. No need to create another pr' else - update "generator-alfresco-adf-app" - update "alfresco-content-app" - update "alfresco-apps" + if [ "$DRY_RUN" = "false" ]; then + update "generator-alfresco-adf-app" + update "alfresco-content-app" + update "alfresco-apps" + else + echo "[dry-run] it would have update repos: 'generator-alfresco-adf-app', 'alfresco-content-app' and 'alfresco-apps'" + fi fi