From 3d8ba30ea0a4dfedcddcf11ecf2bf476cd1af4c3 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 30 Jun 2022 18:01:08 -0400 Subject: chore: forward 1.23.2 to main (#15027) Co-authored-by: David Sherret --- tools/cut_a_release.md | 5 ++--- tools/release/04_post_publish.ts | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/cut_a_release.md b/tools/cut_a_release.md index 3ed0965ad..f956549f1 100644 --- a/tools/cut_a_release.md +++ b/tools/cut_a_release.md @@ -42,9 +42,8 @@ Before starting the process write a message in company's #general channel: 2. Manually run `./_tools/release/01_bump_version.ts --minor` 1. Ensure the version in `version.ts` is updated correctly. 2. Ensure `Releases.md` is updated correctly. - 3. Ensure all the tests pass with the latest build - - Use - `../deno/target/release/deno test --doc --unstable --allow-all --ignore=node/` + 3. Ensure all the tests pass with the latest build (examine the repo for + what the command is and run the local built deno binary) 3. Open a PR with the changes and continue with the steps below. diff --git a/tools/release/04_post_publish.ts b/tools/release/04_post_publish.ts index c6776f408..75bc19925 100755 --- a/tools/release/04_post_publish.ts +++ b/tools/release/04_post_publish.ts @@ -55,6 +55,7 @@ async function forwardReleaseCommitToMain() { await repo.runCommand([ "git", "cherry-pick", + "-Xpatience", releaseCommitHash, ]); await repo.gitPush("origin", newBranchName); -- cgit v1.2.3