From 3f3f0d1554f8d186447802377dae97c6254b1cd7 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 12 May 2022 10:45:48 -0400 Subject: [PATCH] should work this time Signed-off-by: Sebastian Malton --- scripts/clear-release-pr.mjs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/clear-release-pr.mjs b/scripts/clear-release-pr.mjs index 8179dbc236..5aa277982f 100755 --- a/scripts/clear-release-pr.mjs +++ b/scripts/clear-release-pr.mjs @@ -111,7 +111,6 @@ npmVersionArgs.push("--git-tag-version false"); execSync(npmVersionArgs.join(" "), { stdio: "ignore" }); -const newBranchName = execSync("git branch --show-current", { encoding: "utf-8" }); const newVersion = new SemVer(readJsonSync("./package.json").version); const getMergedPrsArgs = [ @@ -181,14 +180,14 @@ if (maintenencePrs.length > 0) { ); } -execSync(`git push --set-upstream origin ${newBranchName}`); +execSync(`git push origin HEAD -u`); const prBody = prBodyLines.join("\n"); + const createPrArgs = [ "pr", "create", - "--base", `origin/${prBase}`, - "--head", `origin/${newBranchName}`, + "--base", prBase, "--title", `release ${newVersion.format()}`, "--label", "skip-changelog", "--body-file", "-",