From f719758edb32a3f60c924f70f4d05d476660c40c Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Thu, 18 Aug 2022 14:05:00 -0700 Subject: [PATCH] Update release process until 4.0 stable is released. This PR will need to be reverted immediately before 4.0 is released. --- .goreleaser.yml | 3 ++- DEVELOPMENT.md | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 4db476ce7d..8d975be529 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -50,7 +50,8 @@ dockers: - "sourcegraph/src-cli:{{ .Tag }}" - "sourcegraph/src-cli:{{ .Major }}" - "sourcegraph/src-cli:{{ .Major }}.{{ .Minor }}" - - "sourcegraph/src-cli:latest" + # Disabled until 4.0 stable is released. + #- "sourcegraph/src-cli:latest" changelog: sort: asc filters: diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index ca256d7288..3f45f144a7 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -1,5 +1,23 @@ This file covers things that are good to know if you're developing or maintaining `src`. It is likely incomplete, and contributions would be most welcome! +## Things are a bit weird right now, August-September 2022 edition + +With 3.43 having been released, we now want to remove a bunch of old backward compatibility code before 4.0 is released in late September. However, we also need to be able to fix bugs and make 3.43.x releases in the interim. + +**Until 4.0 is released, `main` is the 4.0 branch.** + +### Releasing a 3.43.x bug fix + +You must merge the fix into **both** the `3.43` and `main` branches. Then [perform the release normally](#releasing), except note that you **must** be on the `3.43` branch when you run `./release.sh`. + +### Releasing a 4.0 pre-release + +[Perform the release normally](#releasing), but be careful to use a version number that is clearly a pre-release, specifically in the format `4.0.0-rc.X`, where `X` is one higher than the previous pre-release. + +### Releasing 4.0 proper + +If you're reading this because you're about to release the stable 4.0.0 release, please merge #828 first to put the release machinery back the way it was. + ## Contents * [Developing `src`](#development)