From e5e70910099598abec91b34fc2a98b966662b90f Mon Sep 17 00:00:00 2001
From: metamaskbot <metamaskbot@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:05:07 +0200
Subject: [PATCH] fix(release branch name): cleanup deprecated release branch
 name

---
 .github/scripts/create-platform-release-pr.sh |  6 ++--
 .github/scripts/get-release-timelines.sh      |  4 +--
 .github/scripts/slack-release-testing.mjs     | 28 ++-----------------
 .../test-create-platform-release-pr-full.sh   |  4 +--
 4 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/.github/scripts/create-platform-release-pr.sh b/.github/scripts/create-platform-release-pr.sh
index f0c68281..300261f0 100755
--- a/.github/scripts/create-platform-release-pr.sh
+++ b/.github/scripts/create-platform-release-pr.sh
@@ -370,10 +370,8 @@ create_changelog_pr() {
       # Otherwise, DIFF_BASE remains unchanged.
       DIFF_BASE="${previous_version_ref}"
 
-      # Only consider known release branch patterns to avoid regex pitfalls:
-      # - Extension: Version-vx.y.z
-      # - Mobile:    release/x.y.z
-      if [[ "${previous_version_ref}" =~ ^Version-v[0-9]+\.[0-9]+\.[0-9]+$ || "${previous_version_ref}" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+      # Only consider known release branch patterns to avoid regex pitfalls: release/x.y.z
+      if [[ "${previous_version_ref}" =~ ^release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
         echo "Previous version looks like a release branch: ${previous_version_ref}"
         # Check if the exact branch exists on origin without interpolating into a regex
         if git ls-remote --heads origin "${previous_version_ref}" | grep -q "."; then
diff --git a/.github/scripts/get-release-timelines.sh b/.github/scripts/get-release-timelines.sh
index e5eab3a5..5b5b5329 100755
--- a/.github/scripts/get-release-timelines.sh
+++ b/.github/scripts/get-release-timelines.sh
@@ -29,8 +29,8 @@ release_timelines_filename="release-timelines-${VERSION}.csv"
 
 echo "release_pr_merged_at,release_submitted_at,rollout_1_at,rollout_10_at,rollout_100_at,issue_created_at,last_team_assigned_at,triage_completed_at,bugfix_pr_created_at,bugfix_pr_merged_at,cherry_pick_pr_created_at,cherry_pick_pr_merged_at" > "${release_timelines_filename}"
 
-release_branch="Version-v${VERSION}"
-release_pr_title="Version v${VERSION}"
+release_branch="release/${VERSION}"
+release_pr_title="release: ${VERSION}"
 
 release_pr=$(gh pr list --repo "${OWNER}/${REPOSITORY}" --head "${release_branch}" --base stable --state merged --json title,mergedAt | jq --arg title "${release_pr_title}" '.[] | select(.title == $title)')
 release_pr_merged_at=$(echo "${release_pr}" | jq -r '.mergedAt')
diff --git a/.github/scripts/slack-release-testing.mjs b/.github/scripts/slack-release-testing.mjs
index 707c6564..7c91f476 100644
--- a/.github/scripts/slack-release-testing.mjs
+++ b/.github/scripts/slack-release-testing.mjs
@@ -107,28 +107,6 @@ function parseReleaseUpdates(data) {
   return result;
 }
 
-/**
- * Determines the release branch for a given platform/version
- * @param {string} platform 'mobile' or 'extension'
- * @param {string} version semantic version
- * @returns
- */
-function getReleaseBranchName(platform, version) {
-  let releaseBranchName;
-
-  if (platform === 'mobile') {
-    releaseBranchName = `release/${version}`;
-  } else if (platform === 'extension') {
-    releaseBranchName = `Version-v${version}`;
-  } else {
-    throw new Error(
-      `Unknown platform '${platform}'. Must be 'mobile' or 'extension'.`,
-    );
-  }
-
-  return releaseBranchName;
-}
-
 /**
  * Retrieves the URL of the first pull request for a given branch in a specified GitHub repository.
  *
@@ -352,9 +330,9 @@ async function publishReleaseTestingStatus(release) {
   const fmtPlatform = formatTitle(release.Platform);
   const teamResults = parseReleaseUpdates(release.testingStatus);
   const releasePrUrl = await findPullRequestUrlByBranch(
-    'MetaMask',
-    `metamask-${release.Platform}`,
-    getReleaseBranchName(release.Platform, release.SemanticVersion),
+    'MetaMask', // repo owner
+    `metamask-${release.Platform}`, // repo name
+    `release/${release.SemanticVersion}`, // release branch name
   );
   const channel = await getPublishChannelName(release);
 
diff --git a/.github/scripts/tests/test-create-platform-release-pr-full.sh b/.github/scripts/tests/test-create-platform-release-pr-full.sh
index 8cfca48c..9ebf31be 100755
--- a/.github/scripts/tests/test-create-platform-release-pr-full.sh
+++ b/.github/scripts/tests/test-create-platform-release-pr-full.sh
@@ -152,11 +152,11 @@ configure_git
 
 echo ""
 echo "Testing create_release_pr:"
-create_release_pr "extension" "1.5.3" "100" "Version-v1.5.3" "release/1.5.3-Changelog"
+create_release_pr "extension" "1.5.3" "100" "release/1.5.3" "release/1.5.3-Changelog"
 
 echo ""
 echo "Testing create_version_bump_pr:"
-create_version_bump_pr "extension" "1.5.3" "1.6.0" "version-bump-testing/1.6.0" "Version-v1.5.3" "main"
+create_version_bump_pr "extension" "1.5.3" "1.6.0" "version-bump-testing/1.6.0" "release/1.5.3" "main"
 
 echo ""
 echo "4️⃣  TESTING DIFFERENT SCENARIOS"