From 29ff5140212ddad090873088b783fa4c81059077 Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 11:58:02 -0800 Subject: [PATCH 1/2] Fix Android build artifact paths for Adhoc variant The AAB and sourcemap upload paths had 'release/' hardcoded, but Adhoc builds output to 'adhoc/'. Use wildcards to match both variants. Co-authored-by: Cursor --- .github/workflows/buildAndroid.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml index f9b22b384908..0786cc93adc9 100644 --- a/.github/workflows/buildAndroid.yml +++ b/.github/workflows/buildAndroid.yml @@ -219,14 +219,14 @@ jobs: uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f with: name: ${{ inputs.artifact-prefix }}androidBuild-artifact - path: Mobile-Expensify/Android/app/build/outputs/bundle/release/*.aab + path: Mobile-Expensify/Android/app/build/outputs/bundle/*/*.aab - name: Upload Android sourcemap artifact # v6 uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f with: name: ${{ inputs.artifact-prefix }}android-sourcemap-artifact - path: Mobile-Expensify/Android/build/generated/sourcemaps/react/release/index.android.bundle.map + path: Mobile-Expensify/Android/build/generated/sourcemaps/react/*/index.android.bundle.map - name: Install bundletool run: | From 1ec6443dc2575de94c6cb88e991b211074379c7a Mon Sep 17 00:00:00 2001 From: rory Date: Mon, 23 Feb 2026 12:11:21 -0800 Subject: [PATCH 2/2] Collect artifacts to flat directory before uploading Wildcards in upload-artifact paths preserve the variant subdirectory inside the artifact, breaking downstream jobs that expect files at the root (e.g. deploy.yml's createRelease expects Expensify-release.aab directly). Copy AAB and sourcemap to a flat staging dir first. Co-authored-by: Cursor --- .github/workflows/buildAndroid.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml index 0786cc93adc9..5a28f7249217 100644 --- a/.github/workflows/buildAndroid.yml +++ b/.github/workflows/buildAndroid.yml @@ -214,19 +214,25 @@ jobs: if: ${{ inputs.variant == 'Adhoc' }} run: echo "ARTIFACT_URL=$ARTIFACT_URL" >> "$GITHUB_OUTPUT" + - name: Collect build artifacts + run: | + mkdir -p /tmp/android-artifacts + find Mobile-Expensify/Android/app/build/outputs/bundle -name '*.aab' -exec cp {} /tmp/android-artifacts/ \; + find Mobile-Expensify/Android/build/generated/sourcemaps/react -name 'index.android.bundle.map' -exec cp {} /tmp/android-artifacts/ \; + - name: Find and upload AAB artifact # v6 uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f with: name: ${{ inputs.artifact-prefix }}androidBuild-artifact - path: Mobile-Expensify/Android/app/build/outputs/bundle/*/*.aab + path: /tmp/android-artifacts/*.aab - name: Upload Android sourcemap artifact # v6 uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f with: name: ${{ inputs.artifact-prefix }}android-sourcemap-artifact - path: Mobile-Expensify/Android/build/generated/sourcemaps/react/*/index.android.bundle.map + path: /tmp/android-artifacts/index.android.bundle.map - name: Install bundletool run: |