.github/templates: update instructions

Update release instructions to simplify running steps.

Signed-off-by: André Martins <andre@cilium.io>

Author: aanm

.github/templates/release_template_minor.md

@@ -49,7 +49,7 @@ assignees: ''
 - [ ] Run `./release start --steps 3-tag --target-version vX.Y.0`
 - [ ] Ask a maintainer to approve the build in the following link (keep the URL
       of the GitHub run to be used later):
-      [Cilium Image Release builds](https://github.com/cilium/cilium/actions?query=workflow:%22Image+Release+Build%22)
+      [Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml)
 
 ## Post Tagging (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
@@ -59,12 +59,13 @@ assignees: ''
 
 ## Publish helm (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
-- [ ] Ask a maintainer to approve the build in the following link:
-      [Release Tool](https://github.com/cilium/cilium/actions/workflows/release.yaml)
+- [ ] Ask a maintainer to approve the `release-helm` deployment in the GitHub
+      URL of the run kept from the "Tagging" step. ([Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml))
 - [ ] Check if the image build process was successful and check if the helm
       chart was published by the Release bot under the [Cilium helm charts][Cilium charts].
-      If the PR was not opened, you can safely re-run the failed job.
-- [ ] Open [Charts Workflow] and check if the workflow run is successful for vX.Y.0.
+      If that did not happen, you can safely re-run the failed job.
+- [ ] Open [Cilium helm Chart Workflow][Charts Workflow] and check if the
+      workflow run is successful for vX.Y.0.
 
 ## Publish docs
 
@@ -104,7 +105,7 @@ assignees: ''
       Prepare an update PR for the `main` branch to remove references to that
       branch. This may involve modifying documentation, code comments and
       configuration for GitHub or Renovate.
-      - `git grep vX.Y-1`
+      - `git grep vX.Y-2`
 - [ ] Update the [Cilium Wikipedia] release timeline table to reflect the new
       version. Ensure the version, release date, and any notable changes are
       accurately represented in the table and graph.
@@ -120,7 +121,7 @@ assignees: ''
 [read the docs]: https://readthedocs.org/projects/cilium/
 [active versions]: https://readthedocs.org/projects/cilium/versions/?version_filter=vX.Y
 [docsearch-scraper-webhook]: https://github.com/cilium/docsearch-scraper-webhook
-[chart workflow]: https://github.com/cilium/charts/actions/workflows/validate-cilium-chart.yaml
+[Charts Workflow]: https://github.com/cilium/charts/actions/workflows/validate-cilium-chart.yaml
 [Cilium charts]: https://github.com/cilium/charts
 [default version]: https://readthedocs.org/dashboard/cilium/advanced/
 [roadmap]: https://github.com/cilium/cilium/blob/main/Documentation/community/roadmap.rst

.github/templates/release_template_patch.md

@@ -54,7 +54,7 @@ assignees: ''
 - [ ] Run `./release start --steps 3-tag --target-version vX.Y.Z`
 - [ ] Ask a maintainer to approve the build in the following link (keep the URL
       of the GitHub run to be used later):
-      [Cilium Image Release builds](https://github.com/cilium/cilium/actions?query=workflow:%22Image+Release+Build%22)
+      [Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml)
 
 ## Post Tagging (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
@@ -66,12 +66,13 @@ assignees: ''
 
 ## Publish helm (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
-- [ ] Ask a maintainer to approve the build in the following link:
-      [Release Tool](https://github.com/cilium/cilium/actions/workflows/release.yaml)
+- [ ] Ask a maintainer to approve the `release-helm` deployment in the GitHub
+      URL of the run kept from the "Tagging" step. ([Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml))
 - [ ] Check if the image build process was successful and check if the helm
       chart was published by the Release bot under the [Cilium helm charts][Cilium charts].
       If that did not happen, you can safely re-run the failed job.
-- [ ] Open [Charts Workflow] and check if the workflow run is successful for vX.Y.Z.
+- [ ] Open [Cilium helm Chart Workflow][Charts Workflow] and check if the
+      workflow run is successful for vX.Y.Z.
 
 ## Post-release
 

.github/templates/release_template_pre_main.md

@@ -54,7 +54,7 @@ assignees: ''
 - [ ] Run `./release start --steps 3-tag --target-version vX.Y.Z-pre.N`
 - [ ] Ask a maintainer to approve the build in the following link (keep the URL
       of the GitHub run to be used later):
-      [Cilium Image Release builds](https://github.com/cilium/cilium/actions?query=workflow:%22Image+Release+Build%22)
+      [Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml)
 
 ## Post Tagging (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
@@ -63,12 +63,13 @@ assignees: ''
 
 ## Publish helm (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
-- [ ] Ask a maintainer to approve the build in the following link:
-      [Release Tool](https://github.com/cilium/cilium/actions/workflows/release.yaml)
+- [ ] Ask a maintainer to approve the `release-helm` deployment in the GitHub
+      URL of the run kept from the "Tagging" step. ([Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml))
 - [ ] Check if the image build process was successful and check if the helm
       chart was published by the Release bot under the [Cilium helm charts][Cilium charts].
       If that did not happen, you can safely re-run the failed job.
-- [ ] Open [Charts Workflow] and check if the workflow run is successful for vX.Y.Z-pre.N.
+- [ ] Open [Cilium helm Chart Workflow][Charts Workflow] and check if the
+      workflow run is successful for vX.Y.Z-pre.N.
 
 ## Publish docs (only for pre/rc releases)
 

.github/templates/release_template_rc_branch.md

@@ -269,28 +269,23 @@ assignees: ''
 - [ ] Run `./release start --steps 3-tag --target-version vX.Y.Z-rc.W`
 - [ ] Ask a maintainer to approve the build in the following link (keep the URL
       of the GitHub run to be used later):
-      [Cilium Image Release builds](https://github.com/cilium/cilium/actions?query=workflow:%22Image+Release+Build%22)
+      [Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml)
 
 ## Post Tagging (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
 - [ ] Check if the image build process was successful and check the PR opened
-      by the Release bot. If the PR was not opened, you can re-run the workflow
-  -  **IN CASE THE PR WAS NOT OPENED** Go to [release workflow] and Run the
-     workflow from "Branch: main", for step "4-post-release" and version for
-     vX.Y.Z-rc.W
+      by the Release bot. If the PR was not opened, you can safely re-run the failed job.
 - [ ] Merge PR
 
 ## Publish helm (run after docker images are published. In case of failure, this step can be re-run multiple times.)
 
-- [ ] Ask a maintainer to approve the build in the following link:
-      [Release Tool](https://github.com/cilium/cilium/actions/workflows/release.yaml)
+- [ ] Ask a maintainer to approve the `release-helm` deployment in the GitHub
+      URL of the run kept from the "Tagging" step. ([Cilium Image Release builds](https://github.com/cilium/cilium/actions/workflows/build-images-releases.yaml))
 - [ ] Check if the image build process was successful and check if the helm
       chart was published by the Release bot under the [Cilium helm charts][Cilium charts].
-      If that did not happen, you can re-run the workflow.
-      - **IN CASE THE HELM CHART WAS NOT PUSHED** Go to [release workflow]
-        and Run the workflow from "Branch: main", for step "5-publish-helm" and
-        version for vX.Y.Z-rc.W
-- [ ] Open [chart workflow] and check if the workflow run is successful for vX.Y.Z-rc.W.
+      If that did not happen, you can safely re-run the failed job.
+- [ ] Open [Cilium helm Chart Workflow][Charts Workflow] and check if the
+      workflow run is successful for vX.Y.Z-rc.W.
 
 ## Publish docs (only for pre/rc releases)
 
@@ -350,7 +345,7 @@ Thank you for the testing and contributing to the previous pre-releases. There a
 [read the docs]: https://readthedocs.org/projects/cilium/
 [active versions]: https://readthedocs.org/projects/cilium/versions/?version_filter=vX.Y.Z-rc.W
 [docsearch-scraper-webhook]: https://github.com/cilium/docsearch-scraper-webhook
-[chart workflow]: https://github.com/cilium/charts/actions/workflows/validate-cilium-chart.yaml
+[Charts Workflow]: https://github.com/cilium/charts/actions/workflows/validate-cilium-chart.yaml
 [Cilium charts]: https://github.com/cilium/charts
 [Review feature PRs]: https://github.com/cilium/cilium/pulls?q=is%3Aopen+base%3Amain+is%3Apr+-label%3Arelease-note%2Fbug+-label%3Arelease-note%2Fci+-author%3Aapp%2Fcilium-renovate+-label%3Adont-merge%2Fwait-until-release+-label%3Adont-merge%2Fpreview-only+-label%3Aarea%2Fdocumentation+-label%3Acilium-cli-exclusive+-label%3Arelease-blocker%2FX.Y
 [Renovate PRs]: https://github.com/cilium/cilium/pulls?q=is%3Aopen+is%3Apr+author%3Aapp%2Fcilium-renovate+base%3Amain

cmd/checklist/template.go

@@ -13,7 +13,7 @@ import (
 	gh "github.com/google/go-github/v62/github"
 	"golang.org/x/mod/semver"
 
-	templates "github.com/cilium/release/.github/templates"
+	"github.com/cilium/release/.github/templates"
 )
 
 var (
@@ -22,6 +22,7 @@ var (
 		"X.Y.Z-pre.N",
 		"X.Y.Z",
 		"X.Y.W",
+		"X.Y-2",
 		"X.Y-1",
 		"X.Y+1",
 		"X.Y",
@@ -80,6 +81,7 @@ func assembleVersionSubstitutions(version string) ([]string, error) {
 	}
 
 	versionSub["X.Y.W"] = semver.MajorMinor(version) + "." + strconv.Itoa(patch+1)
+	versionSub["X.Y-2"] = semver.Major(version) + "." + strconv.Itoa(minor-2)
 	versionSub["X.Y-1"] = semver.Major(version) + "." + strconv.Itoa(minor-1)
 	versionSub["X.Y+1"] = semver.Major(version) + "." + strconv.Itoa(minor+1)
 	versionSub["X.Y"] = semver.MajorMinor(version)

cmd/checklist/template_test.go

@@ -33,6 +33,7 @@ func Test_assembleVersionSubstitutions(t *testing.T) {
 				"X.Y.Z-pre.N", "",
 				"X.Y.Z", "1.10.0",
 				"X.Y.W", "1.10.1",
+				"X.Y-2", "1.8",
 				"X.Y-1", "1.9",
 				"X.Y+1", "1.11",
 				"X.Y", "1.10",
@@ -46,6 +47,7 @@ func Test_assembleVersionSubstitutions(t *testing.T) {
 				"X.Y.Z-pre.N", "1.10.0-rc.0",
 				"X.Y.Z", "1.10.0",
 				"X.Y.W", "1.10.1",
+				"X.Y-2", "1.8",
 				"X.Y-1", "1.9",
 				"X.Y+1", "1.11",
 				"X.Y", "1.10",
@@ -59,6 +61,7 @@ func Test_assembleVersionSubstitutions(t *testing.T) {
 				"X.Y.Z-pre.N", "1.10.0-pre.0",
 				"X.Y.Z", "1.10.0",
 				"X.Y.W", "1.10.1",
+				"X.Y-2", "1.8",
 				"X.Y-1", "1.9",
 				"X.Y+1", "1.11",
 				"X.Y", "1.10",