Skip to content

chore(branches): rename Version-vx.y.z branches into release/x.y.z #35945

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.

Sign up for GitHub

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
gauthierpetetin merged 3 commits into from
Sep 15, 2025
Merged

chore(branches): rename Version-vx.y.z branches into release/x.y.z #35945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e67ca50
chore(branches): rename Version-vx.y.z branches into release/x.y.z
gauthierpetetin Sep 15, 2025
f5ddefb
fix(bug report issue): adjust inaccurate issueBody
gauthierpetetin Sep 15, 2025
fcc7c19
fix(action): upgrade github-tools where Version-vx.y.z branches got r…
gauthierpetetin Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/create-bug-report-issue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ async function main(): Promise<void> {
process.exit(1);
}

const issueBody = `**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/${projectNumber}/views/${projectViewNumber}), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${releaseVersion}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`Version-v${releaseVersion}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the release branch \`Version-v${releaseVersion}\` or \`release/${releaseVersion}\` merges into \`main\`, indicating the release is prepared for store submission.`;
const issueBody = `**What is this bug report issue for?**\n\n1. This issue is used to track release dates on this [Github Project board](https://github.com/orgs/MetaMask/projects/${projectNumber}/views/${projectViewNumber}), which content then gets pulled into our metrics system.\n\n2. This issue is also used by our Zapier automations, to determine if automated notifications shall be sent on Slack for release \`${releaseVersion}\`. Notifications will only be sent as long as this issue is open.\n\n**Who created and/or closed this issue?**\n\n- This issue was automatically created by a GitHub action upon the creation of the release branch \`release/${releaseVersion}\`, indicating the release was cut.\n\n- This issue gets automatically closed by another GitHub action, once the release branch \`release/${releaseVersion}\` merges into \`stable\`, indicating the release is prepared for store submission.`;
Copy link

@cursor cursor bot Sep 15, 2025

Choose a reason for hiding this comment

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

Bug: Merge Target Update Causes Workflow Discrepancy

The bug report issue body was updated, changing the documented merge target for issue closure from main to stable. This appears to be an unintended workflow change, potentially misrepresenting the actual automation or process. The update also removes the Version-v branch format from the closing condition, which might affect backward compatibility.

Fix in Cursor Fix in Web

const issueId = await createIssue(octokit, repoOwner, planningRepoName, issueTitle, issueBody, [regressionLabelTestingId, typeBugLabelId, teamLabelId]);

// Retrieve project, in order to obtain its ID
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release-pr-legacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
platform: extension
base-branch: ${{ inputs.base-branch }}
semver-version: ${{ inputs.semver-version }}
previous-version-tag: Version-v${{ inputs.previous-semver-version }}
previous-version-tag: release/${{ inputs.previous-semver-version }}
github-tools-version: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
secrets:
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create-release-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ jobs:
create-release-pr:
needs: [resolve-bases, resolve-previous-ref]
name: Create Release Pull Request using Github Tools
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@6090afa85c94a6b64a79e992d94b11610d02181a
uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@8144a84f14b3ecf704846ef3569937df85ad9291
with:
platform: extension
checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
semver-version: ${{ inputs.semver-version }}
previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
github-tools-version: 6090afa85c94a6b64a79e992d94b11610d02181a
github-tools-version: 8144a84f14b3ecf704846ef3569937df85ad9291
Copy link
Contributor Author

@gauthierpetetin gauthierpetetin Sep 15, 2025

Choose a reason for hiding this comment

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

This is to include changes of this PR: MetaMask/github-tools#125

secrets:
# This token needs write permissions to metamask-extension & read permissions to metamask-planning
# If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-release-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
release-branch:
description: 'Release branch including version (e.g., Version-v12.0.0)'
description: 'Release branch including version (e.g., release/12.0.0)'
required: true
type: string
force-retag:
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/services/oauth/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function isProductionBuild() {

/**
* Check if the build is from the release candidate branch.
* Example: `Version-v13.0.0` branch.
* Example: `release/13.0.0` branch.
*
* @returns true if the build is from the release candidate branch, false otherwise
*/
Expand Down
4 changes: 2 additions & 2 deletions development/build/set-environment-variables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ function getGoogleClientId({
) {
// we will only load the Production client Id for production builds and release candidate builds
// prod builds -> `yarn build prod`
// release candidate builds -> `yarn build dist` in the release candidate branches (e.g. `Version-v*`)
// release candidate builds -> `yarn build dist` in the release candidate branches (e.g. `release/*`)
const googleClientIdRef = assertAndLoadEnvVar(
'GOOGLE_CLIENT_ID_REF',
buildType,
Expand Down Expand Up @@ -256,7 +256,7 @@ function getAppleClientId({
) {
// we will only load the Production client Id for production builds and release candidate builds
// prod builds -> `yarn build prod`
// release candidate builds -> `yarn build dist` in the release candidate branches (e.g. `Version-v*`)
// release candidate builds -> `yarn build dist` in the release candidate branches (e.g. `release/*`)
const appleClientIdRef = assertAndLoadEnvVar(
'APPLE_CLIENT_ID_REF',
buildType,
Expand Down
5 changes: 4 additions & 1 deletion development/build/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,10 @@ function getEnvironment({ buildTarget }) {
return ENVIRONMENT.DEVELOPMENT;
} else if (isTestBuild(buildTarget)) {
return ENVIRONMENT.TESTING;
} else if (/^Version-v(\d+)[.](\d+)[.](\d+)/u.test(branch)) {
} else if (
/^Version-v(\d+)[.](\d+)[.](\d+)/u.test(branch) ||
/^release\/(\d+)[.](\d+)[.](\d+)/u.test(branch)
) {
return ENVIRONMENT.RELEASE_CANDIDATE;
} else if (branch === 'main') {
return ENVIRONMENT.STAGING;
Expand Down
2 changes: 1 addition & 1 deletion development/generate-rc-commits.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const octokit = new Octokit({
* Command to run the script: node development/generate-rc-commits.js origin/branchA origin/branchB
*
* @example <caption> Sample command to get all the commits from release v11.13.0 to v11.14.0 </caption>
* node development/generate-rc-commits.js origin/Version-v11.14.0 origin/Version-v11.13.0
* node development/generate-rc-commits.js origin/release/11.14.0 origin/release/11.13.0
* Output: the generated commits will be in a file named 'commits.csv'.
*/

Expand Down
Loading