[No QA] Fail loudly when a Mobile-Expensify PR has cherry-pick conflicts - #98366
Merged
Conversation
cherryPick.yml's conflict-resolution flow (draft PR creation, branch naming, instructions) assumes the conflicting PR lives in E/App. It doesn't work for Expensify/Mobile-Expensify PRs, so instead of silently mishandling those conflicts, fail the workflow with a clear error telling the user to cherry-pick manually.
roryabraham
changed the title
roryabraham
marked this pull request as ready for review
August 11, 2026 20:40
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f93ae27159
ℹ️ 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".
Comment on lines
+226
to
+227
| echo "::error::Please manually cherry-pick ${{ inputs.PULL_REQUEST_URL }} to the Mobile-Expensify ${{ inputs.TARGET }} branch instead." | ||
| exit 1 |
There was a problem hiding this comment.
For Mobile-Expensify PRs with conflicts, this failure path runs after the workflow has already pushed the Mobile-Expensify version bump to the target branch, but exit 1 skips the later E/App push that would publish the matching App version bump and submodule pointer. The error only tells the deployer to cherry-pick the Mobile PR manually, so following it leaves the App target branch without the corresponding version/submodule update and no App deploy is triggered; please either fail before mutating the target branches or include/run the App-side sync in this recovery path.
Useful? React with 👍 / 👎.
Julesssss
approved these changes
Aug 11, 2026
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
Julesssss
reviewed
Aug 11, 2026
| echo "😞 PR can't be automerged, there are merge conflicts in the following files:" | ||
| echo "$UNMERGED_FILES" | ||
| git cherry-pick --abort | ||
| if [[ "${{ steps.getPRInfo.outputs.REPO_FULL_NAME }}" =~ Expensify/Mobile-Expensify* ]]; then |
Contributor
There was a problem hiding this comment.
could reuse startsWith(steps.getPRInfo.outputs.REPO_FULL_NAME, 'Expensify/Mobile-Expensify') for consistency
Contributor
Author
There was a problem hiding this comment.
Good eye, but I think we should keep this because they're functionally the same and run in different contexts. The step-level check is evaluated by the runner, this internal conditional is bash.
Contributor
Author
There was a problem hiding this comment.
Technically we could do
if [[ ${{ startsWith(steps.getPRInfo.outputs.REPO_FULL_NAME, 'Expensify/Mobile-Expensify') && 'true' || 'false' }} == 'true' ]]; then
Or maybe:
if [[ ${{ fromJSON(startsWith(steps.getPRInfo.outputs.REPO_FULL_NAME, 'Expensify/Mobile-Expensify')) }} == 'true' ]]; then
but in both cases, I think the bash-native approach is cleaner
Contributor
|
🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.53-0 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
cherryPick.ymldoesn't handle conflicts in Mobile-Expensify PRs. We should fix that, but for now let's just fail loudly with a better error message.Fixed Issues
$ n/a
Tests
n/a
Offline tests
N/A - this is a GitHub Actions workflow change with no client-side or offline behavior.
QA Steps
N/A - this is an internal CI/CD workflow change with no user-facing behavior. [No QA]
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
N/A - this is a GitHub Actions workflow change with no visual output.