diff --git a/.github/scripts/create-bug-report-issue.ts b/.github/scripts/create-bug-report-issue.ts index 83bee28424a7..93af7af893ea 100644 --- a/.github/scripts/create-bug-report-issue.ts +++ b/.github/scripts/create-bug-report-issue.ts @@ -103,7 +103,7 @@ async function main(): Promise { 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.`; const issueId = await createIssue(octokit, repoOwner, planningRepoName, issueTitle, issueBody, [regressionLabelTestingId, typeBugLabelId, teamLabelId]); // Retrieve project, in order to obtain its ID diff --git a/.github/workflows/create-release-pr-legacy.yml b/.github/workflows/create-release-pr-legacy.yml index ddeee99920fb..bfd6b2fcdc0a 100644 --- a/.github/workflows/create-release-pr-legacy.yml +++ b/.github/workflows/create-release-pr-legacy.yml @@ -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 diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 32fc10465070..4090d7817a5f 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -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 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 diff --git a/.github/workflows/tag-release-branch.yml b/.github/workflows/tag-release-branch.yml index 4cbe15111cee..00e9e597d9a0 100644 --- a/.github/workflows/tag-release-branch.yml +++ b/.github/workflows/tag-release-branch.yml @@ -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: diff --git a/app/scripts/services/oauth/config.ts b/app/scripts/services/oauth/config.ts index 23d52fa0e323..80d6ef014ea6 100644 --- a/app/scripts/services/oauth/config.ts +++ b/app/scripts/services/oauth/config.ts @@ -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 */ diff --git a/development/build/set-environment-variables.js b/development/build/set-environment-variables.js index b2b86bf3593d..6d8a938d8bf3 100644 --- a/development/build/set-environment-variables.js +++ b/development/build/set-environment-variables.js @@ -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, @@ -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, diff --git a/development/build/utils.js b/development/build/utils.js index 836b6561e315..faffdc246c6c 100644 --- a/development/build/utils.js +++ b/development/build/utils.js @@ -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; diff --git a/development/generate-rc-commits.js b/development/generate-rc-commits.js index ca4e3790456e..038ed97dd8db 100644 --- a/development/generate-rc-commits.js +++ b/development/generate-rc-commits.js @@ -15,7 +15,7 @@ const octokit = new Octokit({ * Command to run the script: node development/generate-rc-commits.js origin/branchA origin/branchB * * @example Sample command to get all the commits from release v11.13.0 to v11.14.0 - * 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'. */