From e699cb7c000d3ba37ebfa9e635bb929c9c1e7104 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 14:57:38 -0800 Subject: [PATCH 1/7] Decouple Sentry uploads from platform builds Sentry uploads currently happen inline during Gradle/Xcode/Webpack builds. If Sentry is unreachable (e.g. transient DNS failure), the entire build fails. The Android "clear cache and retry" mechanism made this worse by corrupting the Gradle environment. This commit: - Disables Sentry auto-upload in all platform builds (Android, iOS, Web) by setting SENTRY_DISABLE_AUTO_UPLOAD=true instead of passing SENTRY_AUTH_TOKEN - Removes the flawed Android build retry mechanism - Creates a new callable uploadSentry.yml workflow that centralizes all Sentry upload logic using getsentry/action-release@v3 for sourcemaps and sentry-cli for proguard mappings and dSYMs - Calls uploadSentry.yml from both deploy.yml (staging/production) and buildAdHoc.yml (adhoc, inherited by testBuild/testBuildOnPush) - The uploadSentry job uses continue-on-error at the job level so Sentry failures never block builds or deploys Co-authored-by: Cursor --- .github/workflows/buildAdHoc.yml | 8 ++ .github/workflows/buildIOS.yml | 2 +- .github/workflows/buildWeb.yml | 2 +- .github/workflows/deploy.yml | 8 ++ .github/workflows/uploadSentry.yml | 126 +++++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/uploadSentry.yml diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml index 03f5450e17c4..bdd483b8abf8 100644 --- a/.github/workflows/buildAdHoc.yml +++ b/.github/workflows/buildAdHoc.yml @@ -106,6 +106,14 @@ jobs: pull-request-number: ${{ inputs.APP_PR_NUMBER }} secrets: inherit + uploadSentry: + needs: [buildAndroid, buildIOS, buildWeb] + if: ${{ always() && (needs.buildAndroid.result == 'success' || needs.buildIOS.result == 'success' || needs.buildWeb.result == 'success') }} + uses: ./.github/workflows/uploadSentry.yml + with: + environment: adhoc + secrets: inherit + deployWebAdHoc: name: Deploy Web to S3 (adhoc) needs: [buildWeb] diff --git a/.github/workflows/buildIOS.yml b/.github/workflows/buildIOS.yml index 4b20a2fdacbd..e1b23e167b97 100644 --- a/.github/workflows/buildIOS.yml +++ b/.github/workflows/buildIOS.yml @@ -209,7 +209,7 @@ jobs: uses: callstackincubator/ios@dd30f7e53eee2ea6a59509793d0a30fbb5c91216 env: GITHUB_TOKEN: ${{ github.token }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_DISABLE_AUTO_UPLOAD: 'true' IS_HYBRID_APP: true FORCE_NATIVE_BUILD: ${{ inputs.force-native-build == 'true' && github.run_id || '' }} with: diff --git a/.github/workflows/buildWeb.yml b/.github/workflows/buildWeb.yml index 482a43e8d64c..87ecec465c2b 100644 --- a/.github/workflows/buildWeb.yml +++ b/.github/workflows/buildWeb.yml @@ -52,7 +52,7 @@ jobs: npm run build-adhoc fi env: - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_DISABLE_AUTO_UPLOAD: 'true' - name: Upload web sourcemaps artifact # v6 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ceaee7ac4b8d..49ea45c92580 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -501,6 +501,14 @@ jobs: environment: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }} secrets: inherit + uploadSentry: + needs: [prep, androidBuild, iosBuild, webBuild] + if: ${{ always() && (needs.androidBuild.result == 'success' || needs.iosBuild.result == 'success' || needs.webBuild.result == 'success') }} + uses: ./.github/workflows/uploadSentry.yml + with: + environment: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }} + secrets: inherit + webDeploy: name: Deploy Web to S3 needs: [prep, webBuild, buildStorybook] diff --git a/.github/workflows/uploadSentry.yml b/.github/workflows/uploadSentry.yml new file mode 100644 index 000000000000..946f4274e364 --- /dev/null +++ b/.github/workflows/uploadSentry.yml @@ -0,0 +1,126 @@ +name: Upload debug symbols to Sentry + +on: + workflow_call: + inputs: + environment: + description: "'adhoc', 'staging', or 'production'" + type: string + required: true + artifact-prefix: + description: 'The prefix for build artifact names' + type: string + default: '' + +jobs: + uploadSentry: + name: Upload debug symbols to Sentry + runs-on: blacksmith-4vcpu-ubuntu-2404 + continue-on-error: true + steps: + - name: Checkout + # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd + with: + fetch-depth: 0 + + - name: Download Android sourcemap + id: download-android-sourcemap + continue-on-error: true + # v7 + uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 + with: + name: ${{ inputs.artifact-prefix }}android-sourcemap-artifact + path: ./sentry-sourcemaps + + - name: Download Android proguard mapping + id: download-android-proguard + continue-on-error: true + # v7 + uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 + with: + name: ${{ inputs.artifact-prefix }}android-proguard-mapping + path: ./sentry-proguard + + - name: Download iOS sourcemap + id: download-ios-sourcemap + continue-on-error: true + # v7 + uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 + with: + name: ${{ inputs.artifact-prefix }}ios-sourcemap-artifact + path: ./sentry-sourcemaps + + - name: Download iOS dSYMs + id: download-ios-dsym + continue-on-error: true + # v7 + uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 + with: + name: ${{ inputs.artifact-prefix }}ios-dsym-artifact + path: ./sentry-dsyms + + - name: Download Web sourcemaps + id: download-web-sourcemaps + continue-on-error: true + # v7 + uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 + with: + name: web-sourcemaps-artifact + path: ./sentry-sourcemaps + + - name: Create Sentry release and upload sourcemaps + if: steps.download-android-sourcemap.outcome == 'success' || steps.download-ios-sourcemap.outcome == 'success' || steps.download-web-sourcemaps.outcome == 'success' + # v3.5.0 + uses: getsentry/action-release@dab6548b3c03c4717878099e43782cf5be654289 + env: + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_ORG: expensify + SENTRY_PROJECT: app + with: + environment: ${{ inputs.environment }} + sourcemaps: ./sentry-sourcemaps + set_commits: auto + inject: false + + - name: Install sentry-cli + if: steps.download-android-proguard.outcome == 'success' || steps.download-ios-dsym.outcome == 'success' + run: curl -sL https://sentry.io/get-cli/ | bash + + - name: Upload proguard mapping to Sentry + if: steps.download-android-proguard.outcome == 'success' + env: + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_ORG: expensify + SENTRY_PROJECT: app + run: | + for attempt in 1 2 3; do + echo "Attempt $attempt: uploading proguard mapping..." + if sentry-cli upload-proguard ./sentry-proguard/mapping.txt; then + echo "Proguard mapping uploaded successfully" + exit 0 + fi + echo "::warning::Upload attempt $attempt failed, retrying in 10s..." + sleep 10 + done + echo "::error::Failed to upload proguard mapping after 3 attempts" + exit 1 + + - name: Upload iOS dSYMs to Sentry + if: steps.download-ios-dsym.outcome == 'success' + env: + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_ORG: expensify + SENTRY_PROJECT: app + run: | + for attempt in 1 2 3; do + echo "Attempt $attempt: uploading iOS dSYMs..." + if sentry-cli debug-files upload ./sentry-dsyms/; then + echo "iOS dSYMs uploaded successfully" + exit 0 + fi + echo "::warning::Upload attempt $attempt failed, retrying in 10s..." + sleep 10 + done + echo "::error::Failed to upload iOS dSYMs after 3 attempts" + exit 1 From 355c48e5b23d90db5a6883c52979042918ab2716 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 15:12:47 -0800 Subject: [PATCH 2/7] Add setupSentryCLI composite action with checksum verification Replace `curl | bash` sentry-cli installation with a secure download from GitHub releases that verifies SHA256 checksums, preventing supply chain attacks via the install script. Co-authored-by: Cursor --- .../composite/setupSentryCLI/action.yml | 48 +++++++++++++++++++ .github/workflows/uploadSentry.yml | 4 +- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .github/actions/composite/setupSentryCLI/action.yml diff --git a/.github/actions/composite/setupSentryCLI/action.yml b/.github/actions/composite/setupSentryCLI/action.yml new file mode 100644 index 000000000000..a971742b537e --- /dev/null +++ b/.github/actions/composite/setupSentryCLI/action.yml @@ -0,0 +1,48 @@ +name: Setup Sentry CLI +description: Download sentry-cli binary from GitHub releases with SHA256 checksum verification + +runs: + using: composite + steps: + - name: Download and verify sentry-cli + shell: bash + run: | + # To update: change VERSION and update checksums from + # https://github.com/getsentry/sentry-cli/releases + readonly VERSION="3.2.2" + + declare -A CHECKSUMS=( + ["Linux-x86_64"]="ec5987dc83ce601fb99bbc43abbc5623832ea507c13ee13f9eab62bf77d3e55e" + ["Linux-aarch64"]="06d6498e48eb7c39dbf848a341689eb16ef646eace29d39fd0e4136c637b36a1" + ["Darwin-x86_64"]="fed5ac43d7daa7db665ea74aee1c4ba35da63d745243cf32e6c33762230aab7c" + ["Darwin-arm64"]="5c9fc7f3157d08bc36c9e44d199602e11da5c3135f217068da2d7c3390f0af22" + ) + + OS=$(uname -s) + ARCH=$(uname -m) + EXPECTED_SHA="${CHECKSUMS[${OS}-${ARCH}]}" + + if [[ -z "$EXPECTED_SHA" ]]; then + echo "::error::Unsupported platform: ${OS}-${ARCH}" + exit 1 + fi + + INSTALL_DIR="${RUNNER_TEMP:-/tmp}/sentry-cli" + mkdir -p "$INSTALL_DIR" + + DOWNLOAD_URL="https://github.com/getsentry/sentry-cli/releases/download/${VERSION}/sentry-cli-${OS}-${ARCH}" + echo "Downloading sentry-cli ${VERSION} for ${OS}-${ARCH}..." + + curl --fail --location --retry 3 --retry-delay 3 \ + "$DOWNLOAD_URL" --output "$INSTALL_DIR/sentry-cli" + + ACTUAL_SHA=$(sha256sum "$INSTALL_DIR/sentry-cli" | awk '{print $1}') + if [[ "$ACTUAL_SHA" != "$EXPECTED_SHA" ]]; then + echo "::error::Checksum mismatch for sentry-cli ${VERSION} (${OS}-${ARCH}): expected ${EXPECTED_SHA}, got ${ACTUAL_SHA}" + rm -f "$INSTALL_DIR/sentry-cli" + exit 1 + fi + + chmod +x "$INSTALL_DIR/sentry-cli" + echo "$INSTALL_DIR" >> "$GITHUB_PATH" + echo "Installed sentry-cli ${VERSION} (SHA256 verified)" diff --git a/.github/workflows/uploadSentry.yml b/.github/workflows/uploadSentry.yml index 946f4274e364..2781fc3de0d4 100644 --- a/.github/workflows/uploadSentry.yml +++ b/.github/workflows/uploadSentry.yml @@ -83,9 +83,9 @@ jobs: set_commits: auto inject: false - - name: Install sentry-cli + - name: Setup sentry-cli if: steps.download-android-proguard.outcome == 'success' || steps.download-ios-dsym.outcome == 'success' - run: curl -sL https://sentry.io/get-cli/ | bash + uses: ./.github/actions/composite/setupSentryCLI - name: Upload proguard mapping to Sentry if: steps.download-android-proguard.outcome == 'success' From 20f0336d93a09d81ed8da793bb9a8bf562a2fb40 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 15:21:55 -0800 Subject: [PATCH 3/7] Use descriptive Sentry release names for adhoc builds Instead of auto-generating release names from the git SHA, construct a human-readable name that includes App PR #, Mobile-Expensify PR #, and short commit hashes. For example: adhoc-app83244-6d9d97b-me1234-abc1234 Co-authored-by: Cursor --- .github/workflows/buildAdHoc.yml | 36 +++++++++++++++++++++++++++++- .github/workflows/uploadSentry.yml | 5 +++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml index bdd483b8abf8..b030278313b5 100644 --- a/.github/workflows/buildAdHoc.yml +++ b/.github/workflows/buildAdHoc.yml @@ -106,12 +106,46 @@ jobs: pull-request-number: ${{ inputs.APP_PR_NUMBER }} secrets: inherit + sentryPrep: + name: Prepare Sentry release name + runs-on: blacksmith-2vcpu-ubuntu-2404 + outputs: + RELEASE_NAME: ${{ steps.build-name.outputs.RELEASE_NAME }} + steps: + - name: Build descriptive release name + id: build-name + run: | + APP_REF="${{ inputs.APP_REF }}" + APP_PR="${{ inputs.APP_PR_NUMBER }}" + ME_REF="${{ inputs.MOBILE_EXPENSIFY_REF }}" + ME_PR="${{ inputs.MOBILE_EXPENSIFY_PR }}" + + NAME="adhoc" + + if [ -n "$APP_PR" ]; then + NAME="${NAME}-app${APP_PR}" + fi + + NAME="${NAME}-${APP_REF:0:7}" + + if [ -n "$ME_PR" ]; then + NAME="${NAME}-me${ME_PR}" + fi + + if [ -n "$ME_REF" ] && [ "$ME_REF" != "main" ]; then + NAME="${NAME}-${ME_REF:0:7}" + fi + + echo "RELEASE_NAME=$NAME" >> "$GITHUB_OUTPUT" + echo "Sentry release name: $NAME" + uploadSentry: - needs: [buildAndroid, buildIOS, buildWeb] + needs: [sentryPrep, buildAndroid, buildIOS, buildWeb] if: ${{ always() && (needs.buildAndroid.result == 'success' || needs.buildIOS.result == 'success' || needs.buildWeb.result == 'success') }} uses: ./.github/workflows/uploadSentry.yml with: environment: adhoc + release: ${{ needs.sentryPrep.outputs.RELEASE_NAME }} secrets: inherit deployWebAdHoc: diff --git a/.github/workflows/uploadSentry.yml b/.github/workflows/uploadSentry.yml index 2781fc3de0d4..d9cb314a137a 100644 --- a/.github/workflows/uploadSentry.yml +++ b/.github/workflows/uploadSentry.yml @@ -7,6 +7,10 @@ on: description: "'adhoc', 'staging', or 'production'" type: string required: true + release: + description: 'Sentry release name (omit to auto-generate from git SHA)' + type: string + default: '' artifact-prefix: description: 'The prefix for build artifact names' type: string @@ -79,6 +83,7 @@ jobs: SENTRY_PROJECT: app with: environment: ${{ inputs.environment }} + release: ${{ inputs.release || '' }} sourcemaps: ./sentry-sourcemaps set_commits: auto inject: false From d4c51efcbc5f150d34234265f9a5f83692f0d7c1 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 15:24:08 -0800 Subject: [PATCH 4/7] Use version tag as Sentry release name for staging/production deploys Pass the version tag (e.g. 9.0.35-0 for production, 9.0.35-0-staging for staging) as the Sentry release name instead of auto-generating from the git SHA. Co-authored-by: Cursor --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 49ea45c92580..43f0ac9fcd12 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -507,6 +507,7 @@ jobs: uses: ./.github/workflows/uploadSentry.yml with: environment: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }} + release: ${{ needs.prep.outputs.TAG }} secrets: inherit webDeploy: From 1d0429191e1ffcb39aaa9d6310647678f609b9e7 Mon Sep 17 00:00:00 2001 From: rory Date: Tue, 24 Feb 2026 13:43:04 -0800 Subject: [PATCH 5/7] Disable Sentry auto-upload in Android build The change to replace SENTRY_AUTH_TOKEN with SENTRY_DISABLE_AUTO_UPLOAD was lost during the merge with main. This restores consistency with the iOS and web builds. Co-authored-by: Cursor --- .github/workflows/buildAndroid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml index 1e1c9ef457e5..71f05a7fc43b 100644 --- a/.github/workflows/buildAndroid.yml +++ b/.github/workflows/buildAndroid.yml @@ -165,7 +165,7 @@ jobs: uses: callstackincubator/android@4cedf4d9b5c167452c96fe67233577e0fde9a025 env: GITHUB_TOKEN: ${{ github.token }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + SENTRY_DISABLE_AUTO_UPLOAD: 'true' IS_HYBRID_APP: true FORCE_NATIVE_BUILD: ${{ inputs.force-native-build == 'true' && github.run_id || '' }} with: From c674fcd26edf7acfad81188625df659d21d99dd4 Mon Sep 17 00:00:00 2001 From: rory Date: Tue, 24 Feb 2026 13:54:31 -0800 Subject: [PATCH 6/7] Align Sentry upload release name with runtime SDK The Sentry SDK reports events under `new.expensify@` (from package.json), so uploaded sourcemaps must use the same release name. Instead of passing a release name from callers, uploadSentry.yml now computes it from the checked-out package.json. This eliminates the sentryPrep job in buildAdHoc.yml and removes the release input parameter entirely. Co-authored-by: Cursor --- .github/workflows/buildAdHoc.yml | 36 +----------------------------- .github/workflows/deploy.yml | 3 +-- .github/workflows/uploadSentry.yml | 15 ++++++++----- 3 files changed, 12 insertions(+), 42 deletions(-) diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml index 568d1c7eabfd..81addc920573 100644 --- a/.github/workflows/buildAdHoc.yml +++ b/.github/workflows/buildAdHoc.yml @@ -106,46 +106,12 @@ jobs: pull-request-number: ${{ inputs.APP_PR_NUMBER }} secrets: inherit - sentryPrep: - name: Prepare Sentry release name - runs-on: blacksmith-2vcpu-ubuntu-2404 - outputs: - RELEASE_NAME: ${{ steps.build-name.outputs.RELEASE_NAME }} - steps: - - name: Build descriptive release name - id: build-name - run: | - APP_REF="${{ inputs.APP_REF }}" - APP_PR="${{ inputs.APP_PR_NUMBER }}" - ME_REF="${{ inputs.MOBILE_EXPENSIFY_REF }}" - ME_PR="${{ inputs.MOBILE_EXPENSIFY_PR }}" - - NAME="adhoc" - - if [ -n "$APP_PR" ]; then - NAME="${NAME}-app${APP_PR}" - fi - - NAME="${NAME}-${APP_REF:0:7}" - - if [ -n "$ME_PR" ]; then - NAME="${NAME}-me${ME_PR}" - fi - - if [ -n "$ME_REF" ] && [ "$ME_REF" != "main" ]; then - NAME="${NAME}-${ME_REF:0:7}" - fi - - echo "RELEASE_NAME=$NAME" >> "$GITHUB_OUTPUT" - echo "Sentry release name: $NAME" - uploadSentry: - needs: [sentryPrep, buildAndroid, buildIOS, buildWeb] + needs: [buildAndroid, buildIOS, buildWeb] if: ${{ always() && (needs.buildAndroid.result == 'success' || needs.buildIOS.result == 'success' || needs.buildWeb.result == 'success') }} uses: ./.github/workflows/uploadSentry.yml with: environment: adhoc - release: ${{ needs.sentryPrep.outputs.RELEASE_NAME }} secrets: inherit deployWebAdHoc: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a1ae77ddc9c..319464950c93 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -542,12 +542,11 @@ jobs: secrets: inherit uploadSentry: - needs: [prep, androidBuild, iosBuild, webBuild] + needs: [androidBuild, iosBuild, webBuild] if: ${{ always() && (needs.androidBuild.result == 'success' || needs.iosBuild.result == 'success' || needs.webBuild.result == 'success') }} uses: ./.github/workflows/uploadSentry.yml with: environment: ${{ github.ref == 'refs/heads/production' && 'production' || 'staging' }} - release: ${{ needs.prep.outputs.TAG }} secrets: inherit webDeploy: diff --git a/.github/workflows/uploadSentry.yml b/.github/workflows/uploadSentry.yml index d9cb314a137a..bd2370e46588 100644 --- a/.github/workflows/uploadSentry.yml +++ b/.github/workflows/uploadSentry.yml @@ -7,10 +7,6 @@ on: description: "'adhoc', 'staging', or 'production'" type: string required: true - release: - description: 'Sentry release name (omit to auto-generate from git SHA)' - type: string - default: '' artifact-prefix: description: 'The prefix for build artifact names' type: string @@ -28,6 +24,15 @@ jobs: with: fetch-depth: 0 + - name: Determine Sentry release name + id: release + run: | + PKG_NAME=$(jq -r .name < package.json) + PKG_VERSION=$(jq -r .version < package.json) + RELEASE="${PKG_NAME}@${PKG_VERSION}" + echo "RELEASE=$RELEASE" >> "$GITHUB_OUTPUT" + echo "Sentry release: $RELEASE" + - name: Download Android sourcemap id: download-android-sourcemap continue-on-error: true @@ -83,7 +88,7 @@ jobs: SENTRY_PROJECT: app with: environment: ${{ inputs.environment }} - release: ${{ inputs.release || '' }} + release: ${{ steps.release.outputs.RELEASE }} sourcemaps: ./sentry-sourcemaps set_commits: auto inject: false From 1dbdc3a99a93ee68ece3dfbcd52a2fb134134886 Mon Sep 17 00:00:00 2001 From: rory Date: Tue, 24 Feb 2026 14:08:07 -0800 Subject: [PATCH 7/7] Checkout built ref in uploadSentry to match package.json For ad-hoc builds the artifacts are built from inputs.APP_REF, not github.sha. Pass the ref through so the checkout matches the built code and the derived release name is correct. Co-authored-by: Cursor --- .github/workflows/buildAdHoc.yml | 1 + .github/workflows/uploadSentry.yml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml index 81addc920573..f4b06519fc55 100644 --- a/.github/workflows/buildAdHoc.yml +++ b/.github/workflows/buildAdHoc.yml @@ -112,6 +112,7 @@ jobs: uses: ./.github/workflows/uploadSentry.yml with: environment: adhoc + ref: ${{ inputs.APP_REF }} secrets: inherit deployWebAdHoc: diff --git a/.github/workflows/uploadSentry.yml b/.github/workflows/uploadSentry.yml index bd2370e46588..e4aea40d919e 100644 --- a/.github/workflows/uploadSentry.yml +++ b/.github/workflows/uploadSentry.yml @@ -7,6 +7,10 @@ on: description: "'adhoc', 'staging', or 'production'" type: string required: true + ref: + description: 'Git ref to checkout (must match the ref used to build the artifacts)' + type: string + default: '' artifact-prefix: description: 'The prefix for build artifact names' type: string @@ -22,6 +26,7 @@ jobs: # v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd with: + ref: ${{ inputs.ref || github.sha }} fetch-depth: 0 - name: Determine Sentry release name