From b4af648c1515a8e79d7a5d1b14d8a4ba9d966a72 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 15 Apr 2022 09:39:41 -0400
Subject: [PATCH] chore: release fixes based on doing the v1.20.6 release
 (#14289)

---
 .cargo/config                       | 4 ++--
 .github/workflows/cargo_publish.yml | 4 ++--
 tools/cut_a_release.md              | 3 +--
 tools/release/02_create_pr.ts       | 1 +
 tools/release/04_post_publish.ts    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 0c5791d5f0..bb2ccd68bf 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -6,8 +6,8 @@ rustflags = [
   "-C",
   "target-feature=+crt-static",
   "-C",
-  # double the stack size to prevent swc overflowing the stack in debug
-  "link-arg=/STACK:2097152",
+  # increase the stack size to prevent swc overflowing the stack in debug
+  "link-arg=/STACK:1572864",
 ]
 
 [target.aarch64-apple-darwin]
diff --git a/.github/workflows/cargo_publish.yml b/.github/workflows/cargo_publish.yml
index 6da233cb95..2197f688b5 100644
--- a/.github/workflows/cargo_publish.yml
+++ b/.github/workflows/cargo_publish.yml
@@ -44,6 +44,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.DENOBOT_PAT }}
           GH_WORKFLOW_ACTOR: ${{ github.actor }}
         run: |
-          git config user.email "propelml@gmail.com"
-          git config user.name "denobot"
+          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git config user.name "${{ github.actor }}"
           ./tools/release/04_post_publish.ts
diff --git a/tools/cut_a_release.md b/tools/cut_a_release.md
index 876bc32015..c2b190049f 100644
--- a/tools/cut_a_release.md
+++ b/tools/cut_a_release.md
@@ -35,8 +35,7 @@ Before starting the process write a message in company's #general channel:
 3. A PR will be automatically created. Follow the checklist in the PR and review
    it.
 
-4. Merge the PR. While doing so, ensure that the commit name is exactly the
-   version name. Eg. `0.121.0`, not `0.121.0 (#1810)`.
+4. Merge the PR.
 
 5. Wait for the CI run to complete which will tag the repo and create a draft
    release. Review the draft release and then publish it.
diff --git a/tools/release/02_create_pr.ts b/tools/release/02_create_pr.ts
index 93cbd64c26..efaf890f6c 100755
--- a/tools/release/02_create_pr.ts
+++ b/tools/release/02_create_pr.ts
@@ -34,6 +34,7 @@ console.log(`Opened PR at ${openedPr.data.url}`);
 function getPrBody() {
   let text = `Bumped versions for ${cliCrate.version}\n\n` +
     `Please ensure:\n` +
+    `- [ ] Target branch is correct\n` +
     `- [ ] Crate versions are bumped correctly\n` +
     `- [ ] deno_std version is incremented in the code\n` +
     `- [ ] Releases.md is updated correctly\n\n` +
diff --git a/tools/release/04_post_publish.ts b/tools/release/04_post_publish.ts
index b9da77c053..c6776f4080 100755
--- a/tools/release/04_post_publish.ts
+++ b/tools/release/04_post_publish.ts
@@ -50,7 +50,7 @@ async function forwardReleaseCommitToMain() {
     "checkout",
     "-b",
     newBranchName,
-    "main",
+    "origin/main",
   ]);
   await repo.runCommand([
     "git",