From ddc59f1ceedfde9c14a7e141b226b06c5bef4353 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 26 Jul 2022 10:48:31 +0200 Subject: [PATCH] RELEASE.md: bump version in stable.txt after release Update stable.txt only after the new version was tagged and released. Otherwise, there is a small time window where stable.txt would point to an inexistent version. Ref. https://github.com/cilium/cilium-cli/pull/983#issuecomment-1189148903 Suggested-by: Michi Mutsuzaki Signed-off-by: Tobias Klauser --- RELEASE.md | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index de8b83e23f..ccfeabda8b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -23,19 +23,12 @@ Update the *Releases* section of the `README.md` which lists all currently supported releases in a table. The version in this table needs to be updated to match the new release `$RELEASE`. -### (Optional) Update stable.txt - -The CLI installation instructions in the Cilium documentation use the version -specified in `stable.txt` in the `master` branch. Update `stable.txt` whenever -Cilium users should pick up this new release for installation: - - echo $RELEASE > stable.txt - ### Create release preparation branch and open PR git checkout -b pr/prepare-$RELEASE - git add README.md stable.txt + git add README.md git commit -s -m "Prepare for $RELEASE release" + git push origin HEAD Then open a pull request against `master` branch. Wait for the PR to be reviewed and merged. @@ -64,3 +57,18 @@ When a tag is pushed, a GitHub Action job takes care of creating a new GitHub draft release, building artifacts and attaching them to the draft release. Once the draft is ready, use the "Auto-generate release notes" button to generate the release notes from PR titles, review them and publish the release. + +### Update stable.txt + +The CLI installation instructions in the Cilium documentation use the version +specified in `stable.txt` in the `master` branch. Update `stable.txt` after the +release, whenever Cilium users should pick up this new release for +installation: + + echo $RELEASE > stable.txt + git checkout -b pr/update-stable-$RELEASE + git add stable.txt + git commit -s -m "Update stable release to $RELEASE" + git push origin HEAD + +Then open a pull request against `master` branch.