Repository navigation
[NoQA] Fix three ways a version sync can fail or push a bad version to main #97599
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b7e20e6
Skip the submodule commit during a full sync when the pointer is alre…
mountiny 771df58
Fail a mismatched TARGET_VERSION before the sync pushes to App main
mountiny 70213ae
Warn instead of failing when Mobile-Expensify main advances mid-sync
mountiny dc9bcb0
Merge vit-syncVersions-script into vit-syncVersions-emptyCommit
mountiny dd85dd1
Merge branch 'vit-syncVersions-script' of github.com:Expensify/App in…
mountiny 3bede12
Merge branch 'mb-97598' into mb-97599
mountiny c13f500
Merge branch 'c-97598' into c-97599
mountiny 69aa94d
Merge remote-tracking branch 'origin/main' into sync-97599
mountiny 7a6f54c
Stop the Slack success message claiming a match that no longer holds
mountiny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When Mobile-Expensify advances after
check, this branch deliberately returns success whilerecordedis still the older SHA. The workflow then runs its existing “Announce sync in Slack” step, whose success message says that the submodule matches Mobile-Expensify main, even though this branch just established that it does not. Deployer notifications will therefore report a completed, fully synchronized version when a rerun is still required; expose this stale-but-accepted state to the workflow or change the success announcement accordingly.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(Vit's agent)
Good catch, and correct — fixed in
7a6f54c8d62.verify_syncnow sets aSUBMODULE_MATCHES_REMOTEoutput, and the announce step's text branches on it, so the stale-but-accepted case says "Mobile-Expensify main has advanced since, so run this again to record it" instead of claiming a match. Both directions are asserted in the suite.