Skip to content

[No QA] Separate build and upload jobs in deploy workflow#81269

Merged
roryabraham merged 56 commits intomainfrom
Rory-SeparateBuildAndUpload
Feb 23, 2026
Merged

[No QA] Separate build and upload jobs in deploy workflow#81269
roryabraham merged 56 commits intomainfrom
Rory-SeparateBuildAndUpload

Conversation

@roryabraham
Copy link
Contributor

@roryabraham roryabraham commented Feb 3, 2026

Explanation of Change

This PR refactors the CI/CD build infrastructure in two main ways:

1. Separate build and upload jobs in deploy.yml

Previously, if an upload failed (e.g., Google Play or TestFlight), we had to rebuild the entire app. Now Android and iOS each have dedicated build, upload, and submit jobs. Testing uploads (BrowserStack/Applause) run in parallel with store uploads and use continue-on-error: true so they can't block deployments. This also saves money by using large runners only for heavy builds, not while waiting on app store uploads.

2. Unified callable build workflows

Extracted build logic into three reusable callable workflows that serve both deploy.yml (Release) and test builds (Adhoc):

  • buildAndroid.yml – Android HybridApp build via Rock Remote Build, with Gradle cache retry for durability. Produces AAB, APK (via bundletool), and sourcemap artifacts.
  • buildIOS.yml – iOS HybridApp build via Rock Remote Build, with variant-specific provisioning profiles and ExportOptions.plist. Includes CocoaPods caching. Produces IPA, dSYM, and sourcemap artifacts.
  • buildWeb.yml – Web build with environment-specific build commands, optional S3 deployment, and Cloudflare cache purging.

testBuild.yml and testBuildOnPush.yml now call these callable workflows directly (replacing the deleted buildAdHoc.yml). Both support a FORCE_NATIVE_BUILD option to bypass the Rock remote cache.

Fixed Issues

$ #81257

Tests

N/A - GitHub Actions workflow changes will be validated on next deploy

Offline tests

N/A

QA Steps

N/A

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Split Android and iOS jobs into separate build and upload jobs to avoid
rebuilding when uploads fail. Upload jobs are further split into critical
store uploads and non-critical testing uploads that run in parallel.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

Co-authored-by: Cursor <cursoragent@cursor.com>
chatgpt-codex-connector[bot]

This comment was marked as outdated.

roryabraham and others added 3 commits February 2, 2026 23:42
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Since GITHUB_ENV doesn't persist across jobs, we need to set the
aabPath, ipaPath, and dsymPath environment variables after downloading
the artifacts in the upload jobs.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

On production deploys, native builds are skipped so no artifacts are
uploaded. Add conditional checks to skip download/upload steps that
depend on build artifacts, while still allowing production rollout
steps to run.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

@roryabraham roryabraham requested a review from Julesssss February 3, 2026 07:57
roryabraham and others added 2 commits February 3, 2026 00:04
Add SHOULD_DEPLOY_NATIVE output to prep job and reference it throughout
the workflow instead of repeating the condition inline.

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
chatgpt-codex-connector[bot]

This comment was marked as resolved.

The dSYM upload lane references Mobile-Expensify/iOS/Pods/FirebaseCrashlytics/upload-symbols,
so the checkout needs to pull submodules.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

The dSYM upload lane uses the Crashlytics upload-symbols binary
from Mobile-Expensify/iOS/Pods, so we need to install pods before
running the upload.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

GitHub Actions expressions don't allow dot-notation access to keys
containing hyphens. Changed needs.ios-upload-testflight.result to
needs['ios-upload-testflight'].result and similarly for android-upload-google-play.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

Include android-build and ios-build in the postSlackMessageOnFailure
job's needs array so build failures also trigger Slack notifications.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

Modified the upload_testflight_hybrid lane to read the IPA path from
the ipaPath environment variable. This allows the lane to work when
run in a separate job from the build, where the lane context is not
available.

Co-authored-by: Cursor <cursoragent@cursor.com>
@roryabraham

This comment has been minimized.

@chatgpt-codex-connector
Copy link

Codex Review: Didn't find any major issues. What shall we delve into next?

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@roryabraham roryabraham changed the title [WIP][No QA] Separate build and upload jobs in deploy workflow [No QA] Separate build and upload jobs in deploy workflow Feb 21, 2026
@roryabraham roryabraham marked this pull request as ready for review February 21, 2026 22:47
@roryabraham roryabraham requested a review from a team as a code owner February 21, 2026 22:47
@melvin-bot melvin-bot bot requested a review from rojiphil February 21, 2026 22:47
@roryabraham
Copy link
Contributor Author

@Julesssss ready for review!

@melvin-bot
Copy link

melvin-bot bot commented Feb 21, 2026

@rojiphil Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot removed the request for review from a team February 21, 2026 22:47
Julesssss
Julesssss previously approved these changes Feb 23, 2026
Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed as best as I could for large workflow changes. Lets keep an eye out on the next release.

FYI @puneetlath in case the App deploy explodes

firebase.json is no longer needed for Android builds (already removed
from main) or for the TestFlight upload job which only uploads a
pre-built IPA. iOS build (buildIOS.yml) still loads it for Crashlytics.

Co-authored-by: Cursor <cursoragent@cursor.com>
@Julesssss
Copy link
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@roryabraham
Copy link
Contributor Author

not waiting for reassure since this is a CI/CD-only change

@roryabraham roryabraham merged commit 5a6dbe1 into main Feb 23, 2026
14 of 18 checks passed
@roryabraham roryabraham deleted the Rory-SeparateBuildAndUpload branch February 23, 2026 19:50
@github-actions
Copy link
Contributor

🚧 @roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions
Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #81269.

Android 🤖 iOS 🍎
❌ FAILED ❌ https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5a6dbe1-173a462-1a66b9db3400011ae372eb4831e9ff91edb57a41/index.html
The QR code can't be generated, because the Android build failed iOS
Web 🕸️
https://81269.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Feb 23, 2026
roryabraham added a commit that referenced this pull request Feb 23, 2026
[No QA] Separate build and upload jobs in deploy workflow

(cherry picked from commit 5a6dbe1)

(cherry-picked to staging by roryabraham)

Co-authored-by: Cursor <cursoragent@cursor.com>
@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.3.25-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 cancelled 🔪

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.25-13 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants