Skip to content

[No QA] Prevent duplicate deployment comments after cherry-picks - #105331

Merged
roryabraham merged 3 commits into
mainfrom
fix/duplicate-staging-deploy-comments
Oct 30, 2026
Merged

roryabraham merged 3 commits into
mainfrom
fix/duplicate-staging-deploy-comments

Conversation

@roryabraham

@roryabraham roryabraham commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Prevent duplicate deployment comments when an original merge commit reaches a release branch after its cherry-pick has already shipped. This caused App PR #105297 to receive a second "Cherry-picked to staging" comment.

  • Compare release tags in both directions and exclude PRs already present in the prior release's divergent history, for staging and production in both App and Mobile-Expensify.
  • Identify staging cherry-picks from the full bounded deployment range, not just HEAD, persistent CP Staging labels, or older releases. Share the prior-release tag with the comment action, fetch paginated history once per repository, and preserve each PR's cherry-pick initiator even beneath an unmarked merge or submodule update.
  • Add regression coverage and rebuild the affected GitHub Action bundles. No product UI changes.
AI tests
  • TDD: first reproduced four failures for cherry-pick markers beneath unmarked HEAD commits in App and Mobile-Expensify. After the fix, all 98 targeted Bun tests pass across getDeployPullRequestList.test.ts, markPullRequestsAsDeployed.test.ts, GitUtils.test.ts, and GithubUtils.test.ts. Coverage includes separate initiators for multiple PRs and excludes markers before staging or production release boundaries.
  • Passed: npm run lint-changed, npm run spell-changed, scoped oxfmt --check, and npm run typecheck -- tsconfig.bun.json.
  • Read-only replay against the historical GitHub tags preserves [CP Stg] Fix overlapping submit buttons after cancelling PDF generation #105297 in 9.5.24-8-staging and excludes it, along with five other already-released App cherry-picks, from 9.5.25-0-staging. No comments or deployments were triggered.
  • The original revision passed human Crit review. The follow-up addressing the unmarked-HEAD review comment uses the same required coding-standards review.
  • Full typecheck remains blocked by unrelated camera and Onyx dependency/type errors and a missing oxlint module. The full action-bundle verifier rebuilds two untouched bundles differently with the shared local dependencies; that unrelated generated churn is excluded. The affected bundles were rebuilt.
  • agents sync --check passed from the parent workspace, where the agents configuration lives.

Fixed Issues

$

Tests

Added automated tests.

  • Verify that no errors appear in the JS console

Offline tests

None.

QA Steps

None.

  • Verify that no errors appear in the JS console

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
  • 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.

Screenshots/Videos

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

Exclude PRs already present in the prior release's divergent history.
Use the current staging tag instead of persistent CP labels to identify
cherry-pick notifications.
@roryabraham
roryabraham requested a review from a team October 29, 2026 03:35
@roryabraham
roryabraham marked this pull request as ready for review October 29, 2026 03:55
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 29, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-29T03:59:00.853505Z e439c24 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@melvin-bot
melvin-bot Bot requested review from mollfpr and removed request for a team October 29, 2026 03:55
@melvin-bot

melvin-bot Bot commented Oct 29, 2026

Copy link
Copy Markdown

@mollfpr 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]

chatgpt-codex-connector[bot]

This comment was marked as resolved.

@roryabraham
roryabraham requested a review from a team as a code owner October 29, 2026 04:14
@melvin-bot
melvin-bot Bot requested review from amyevans and removed request for a team October 29, 2026 04:15
@melvin-bot

melvin-bot Bot commented Oct 29, 2026

Copy link
Copy Markdown

@amyevans 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]

@amyevans amyevans left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice improvement, I've definitely found the extra comments a little confusing before!

@roryabraham
roryabraham merged commit d27a71f into main Oct 30, 2026
36 of 39 checks passed
@roryabraham
roryabraham deleted the fix/duplicate-staging-deploy-comments branch October 30, 2026 21:22
@OSBotify

Copy link
Copy Markdown
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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.5.27-0 🚀

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

@OSBotify

OSBotify commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.5.27-2 🚀

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

Bundle Size Analysis (Sentry):

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants