From 5312ea0b2caf25fdd3a508efe27d55a6f9049f49 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 20 Mar 2023 13:37:12 +0100 Subject: [PATCH 1/2] Update code blocks --- release-procedure.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-procedure.md b/release-procedure.md index d76ba2e4c..ac6a0236b 100644 --- a/release-procedure.md +++ b/release-procedure.md @@ -19,7 +19,7 @@ The release announcement lives on the website, and needs to be created in the [w First, create the initial draft of the release announcement: -``` +``` sh automator announcement ``` @@ -41,7 +41,7 @@ When done, deploy to the website. In the main Fornjot repository, do this: -``` +``` sh git switch -c release ``` From b55c23e4c9fbc396f63f627b624949d12e8c92e0 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 20 Mar 2023 13:37:38 +0100 Subject: [PATCH 2/2] Make procedure for release PR a bit clearer --- release-procedure.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release-procedure.md b/release-procedure.md index ac6a0236b..7129454aa 100644 --- a/release-procedure.md +++ b/release-procedure.md @@ -70,7 +70,9 @@ Create a pull request: - Mention the version in the title (e.g. `Release v0.1.2`). - Label it as `release`. -- Lock the pull request. Anything that updates this pull request (like comments), could confuse next week's release automation (because GitHub doesn't allow sorting pull requests by merge date, unfortunately). +- Lock the pull request. + +The pull request needs to be locked, as anything that updates it (like comments), could confuse next week's release automation (because GitHub doesn't allow sorting pull requests by merge date, unfortunately). Once the CI build completed successfully, merge the pull request. The release automation will now compile binaries, create a release on GitHub, and publish to [crates.io](https://crates.io/).