Skip to content

Commit 3ed8dcd

Browse files
authored
Fix the v3 backport message to use v3-backport-PR (#9777)
* Fix the v3 backport message to use v3-backport-PR * fixup! actually create the v3 PR * fixup! this will not happen again!
1 parent 869b755 commit 3ed8dcd

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/open-v3-maintenance-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ jobs:
6363
with:
6464
header: v3-backport
6565
message: |
66-
These changes have been automatically backported to Wrangler v3 :tada: You can view the automatically updated PR at https://github.com/cloudflare/workers-sdk/compare/v3-maintenance...v3-maintenance-${{ github.event.number }}. Please check that PR for correctness, and make sure it's merged after this one. Thank you for helping us keep Wrangler v3 supported!
66+
These changes have been automatically backported to Wrangler v3 :tada: You can view the automatically updated PR at https://github.com/cloudflare/workers-sdk/compare/v3-maintenance...v3-backport-${{ github.event.number }}. Please check that PR for correctness, and make sure it's merged after this one. Thank you for helping us keep Wrangler v3 supported!

tools/deployments/open-v3-pr.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import parseChangeset from "@changesets/parse";
66
if (require.main === module) {
77
if (isWranglerPatch(process.env.FILES as string)) {
88
// Create a new branch for the v3 maintenance PR
9-
execSync(`git checkout -b v3-backport-${process.env.PR_NUMBER} -f`);
9+
const branch = `v3-backport-${process.env.PR_NUMBER}`;
10+
execSync(`git checkout -b ${branch} -f`);
1011

11-
execSync(
12-
`git rebase --onto origin/v3-maintenance origin/main v3-backport-${process.env.PR_NUMBER}`
13-
);
12+
execSync(`git rebase --onto origin/v3-maintenance origin/main ${branch}`);
1413

1514
execSync(`git push origin HEAD --force`);
1615

@@ -23,7 +22,7 @@ if (require.main === module) {
2322
`create`,
2423
`--base`,
2524
`v3-maintenance`,
26-
`--head v3-maintenance-${process.env.PR_NUMBER}`,
25+
`--head ${branch}`,
2726
`--label "skip-pr-description-validation"`,
2827
`--label "skip-v3-pr"`,
2928
`--label "v3-backport"`,

0 commit comments

Comments
 (0)