Skip to content

Commit 8144a84

Browse files
chore(branches): rename Version-vx.y.z branches into release/x.y.z (#125)
* chore(branches): rename Version-vx.y.z branches into release/x.y.z * fix(get_release_branch_name): simplify tests --------- Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
1 parent cd05aec commit 8144a84

File tree

3 files changed

+8
-33
lines changed

3 files changed

+8
-33
lines changed

.github/scripts/create-platform-release-pr.sh

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,36 +82,15 @@ get_expected_changed_files() {
8282
# For all platforms: release/{version}
8383
# If TEST_ONLY=true: release-testing/{version}
8484
get_release_branch_name() {
85-
local platform="$1"
86-
local new_version="$2"
87-
88-
# Validate platform
89-
if [[ "$platform" != "mobile" && "$platform" != "extension" ]]; then
90-
echo "Error: Unknown platform '$platform'. Must be 'mobile' or 'extension'."
91-
exit 1
92-
fi
85+
local new_version="$1"
9386

9487
# Use test branch if TEST_ONLY is true
9588
if [ "$TEST_ONLY" == "true" ]; then
9689
echo "release-testing/${new_version}"
9790
return 0
9891
fi
9992

100-
# Different release branch naming for different platforms
101-
if [[ "$platform" == "mobile" ]]; then
102-
echo "release/${new_version}"
103-
elif [[ "$platform" == "extension" ]]; then
104-
local candidate_primary="Version-v${new_version}"
105-
local candidate_alt="release/${new_version}"
106-
# Prefer Version-v... if it exists on origin; otherwise use release/... if present; else default to Version-v...
107-
if git ls-remote --heads origin "${candidate_primary}" | grep -q "."; then
108-
echo "${candidate_primary}"
109-
elif git ls-remote --heads origin "${candidate_alt}" | grep -q "."; then
110-
echo "${candidate_alt}"
111-
else
112-
echo "${candidate_primary}"
113-
fi
114-
fi
93+
echo "release/${new_version}"
11594
}
11695

11796
# Calculate next version for main branch bump
@@ -512,7 +491,7 @@ main() {
512491

513492
# Initialize branch names
514493
local release_branch_name changelog_branch_name version_bump_branch_name
515-
release_branch_name=$(get_release_branch_name "$PLATFORM" "$NEW_VERSION")
494+
release_branch_name=$(get_release_branch_name "$NEW_VERSION")
516495
changelog_branch_name="chore/${NEW_VERSION}-Changelog"
517496
version_bump_branch_name=$(get_version_bump_branch_name "$next_version") # Execute main workflow
518497
configure_git

.github/scripts/tests/test-create-platform-release-pr-full.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ fi
118118
echo ""
119119
echo "Testing branch naming (test mode):"
120120
export TEST_ONLY="true"
121-
echo " Mobile release: $(get_release_branch_name "mobile" "1.5.3")"
122-
echo " Extension release: $(get_release_branch_name "extension" "1.5.3")"
121+
echo " Release: $(get_release_branch_name "1.5.3")"
123122
echo " Version bump: $(get_version_bump_branch_name "1.6.0")"
124123

125124
echo ""
@@ -164,9 +163,8 @@ echo "4️⃣ TESTING DIFFERENT SCENARIOS"
164163
echo "================================"
165164

166165
echo ""
167-
echo "Testing with different platforms:"
168-
echo "Mobile release branch: $(get_release_branch_name "mobile" "2.0.0")"
169-
echo "Extension release branch: $(get_release_branch_name "extension" "2.0.0")"
166+
echo "Testing release branch:"
167+
echo "Release branch: $(get_release_branch_name "2.0.0")"
170168

171169
echo ""
172170
echo "Testing production vs test mode:"

.github/scripts/tests/test-create-platform-release-pr-functions.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,10 @@ echo ""
4242
# Test get_release_branch_name function (safe - no external calls)
4343
echo "Testing get_release_branch_name (SAFE):"
4444
export TEST_ONLY="false"
45-
echo " Mobile (prod): $(get_release_branch_name "mobile" "1.5.3")"
46-
echo " Extension (prod): $(get_release_branch_name "extension" "1.5.3")"
45+
echo " Input (prod): 1.5.3 -> Output: $(get_release_branch_name "1.5.3")"
4746

4847
export TEST_ONLY="true"
49-
echo " Mobile (test): $(get_release_branch_name "mobile" "1.5.3")"
50-
echo " Extension (test): $(get_release_branch_name "extension" "1.5.3")"
48+
echo " Input (test): 1.5.3 -> Output: $(get_release_branch_name "1.5.3")"
5149

5250
echo ""
5351

0 commit comments

Comments
 (0)