Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .github/scripts/create-platform-release-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/get-release-timelines.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
28 changes: 3 additions & 25 deletions .github/scripts/slack-release-testing.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/tests/test-create-platform-release-pr-full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading