diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e410b8d2832..c554b05db77 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,15 @@ jobs: bundle config path vendor/bundle bundle install --jobs 4 --retry 3 + - name: Update app CI Build info + run: | + ./scripts/update_app_ci_build_info.sh \ + $GITHUB_REPOSITORY \ + $GITHUB_REF_NAME \ + $GITHUB_SHA \ + $GITHUB_RUN_ID \ + $GITHUB_RUN_ATTEMPT + - name: Check run: bundle exec fastlane check @@ -184,15 +193,6 @@ jobs: distribution: "temurin" java-version: ${{ env.JAVA_VERSION }} - - name: Update app CI Build info - run: | - ./scripts/update_app_ci_build_info.sh \ - $GITHUB_REPOSITORY \ - $GITHUB_REF_NAME \ - $GITHUB_SHA \ - $GITHUB_RUN_ID \ - $GITHUB_RUN_ATTEMPT - - name: Increment version run: | DEFAULT_VERSION_CODE=$((11000+$GITHUB_RUN_NUMBER)) @@ -469,15 +469,6 @@ jobs: distribution: "temurin" java-version: ${{ env.JAVA_VERSION }} - - name: Update app CI Build info - run: | - ./scripts/update_app_ci_build_info.sh \ - $GITHUB_REPOSITORY \ - $GITHUB_REF_NAME \ - $GITHUB_SHA \ - $GITHUB_RUN_ID \ - $GITHUB_RUN_ATTEMPT - # Start from 11000 to prevent collisions with mobile build version codes - name: Increment version run: | diff --git a/scripts/update_app_ci_build_info.sh b/scripts/update_app_ci_build_info.sh index c3deb95c259..0831a517cef 100755 --- a/scripts/update_app_ci_build_info.sh +++ b/scripts/update_app_ci_build_info.sh @@ -8,7 +8,7 @@ if [ $# -ne 5 ]; then echo "Usage: $0 " - echo "E.g: $0 bitwarden/android main abc123 123 1" + echo "E.g: ./scripts/$0 bitwarden/android main abc123 123 1" exit 1 fi @@ -20,7 +20,7 @@ commit_hash=$3 ci_run_number=$4 ci_run_attempt=$5 -ci_build_info_file="../ci.properties" +ci_build_info_file="ci.properties" git_source="${repository}/${branch}@${commit_hash}" ci_run_source="${repository}/actions/runs/${ci_run_number}/attempts/${ci_run_attempt}" emoji_brick="\\ud83e\\uddf1" # 🧱