INFRA-3041:removed extra stable sync PR files #160
Merged
Conversation
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
7 tasks
github-merge-queue bot
pushed a commit
to MetaMask/metamask-mobile
that referenced
this pull request
Nov 7, 2025
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Ticket: https://consensyssoftware.atlassian.net/browse/INFRA-3041 Github-tools PR: MetaMask/github-tools#154, MetaMask/github-tools#160 Changelog PR before updates: consensys-test#31 Changelog PR after updates: consensys-test#37 Summary of Changes Prevented github-tools from appearing in PRs File: github-tools/.github/workflows/stable-sync.yml What: Added explicit cleanup commands to unstage and remove github-tools directory before pushing Impact: The sync PR will no longer include a github-tools/ submodule or directory Disabled package.json version bump for Extension File: github-tools/.github/scripts/stable-sync.js What: Removed the yarn version logic that bumped package.json version Before: Extension ran yarn version to update the version After: Extension now preserves package.json from stable branch (same as mobile) Impact: No version bump will occur in the sync PR for either mobile or extension Verified PR title format File: github-tools/.github/workflows/stable-sync.yml (line 147) What: Confirmed it already uses release: prefix (no change needed) Format: "release: sync stable to main for version X.Y.Z" Testing in Extension: consensys-test/metamask-extension-test-workflow2#209, https://github.com/consensys-test/metamask-extension-test-workflow2/actions/runs/18951817173 Testing in Mobile: consensys-test#30, https://github.com/consensys-test/metamask-mobile-test-workflow/actions/runs/18951842114 Testing Post CR comments: consensys-test/metamask-extension-test-workflow2#212 ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: None ## **Related issues** Fixes: ## **Manual testing steps** ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Updates the stable branch sync workflow to use metamask/github-tools commit 701a894 for both the reusable workflow and the input version. > > - **CI/Workflows**: > - Update `uses` in `.github/workflows/stable-branch-sync.yml` to `metamask/github-tools/.github/workflows/stable-sync.yml@701a894f38883ab48560f948e98b76cc6b4d623f`. > - Set `github-tools-version` input to `701a894f38883ab48560f948e98b76cc6b4d623f`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 77f5118. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changelog PR before updates: consensys-test/metamask-mobile-test-workflow#31
Changelog PR after updates: consensys-test/metamask-mobile-test-workflow#37
What changed:
Before:
git checkout origin/stable -- bitrise.yml (and other files)
Used stable versions → showed as changes in PR
After:
git checkout origin/main -- bitrise.yml (and other files)
Uses main versions → NO changes shown in PR
Result for the PR:
The PR will now show:
✅ CHANGELOG.md updates (from stable)
✅ Code changes (already in main, just bringing commit history)
❌ No changes to bitrise.yml, android/app/build.gradle, ios/MetaMask.xcodeproj/project.pbxproj, or package.json
Those files will match main exactly, so they won't clutter the PR with configuration differences.
Note
Switches mobile-specific file checkouts to
origin/mainto preserve certain files during stable-sync..github/scripts/stable-sync.js):REPO=mobile, now checks out fromorigin/main(instead oforigin/${baseBranch}) to preserve:bitrise.ymlandroid/app/build.gradleios/MetaMask.xcodeproj/project.pbxprojpackage.jsonWritten by Cursor Bugbot for commit cf99d36. This will update automatically on new commits. Configure here.