From 80a4a210df4dae6a257924746c1f3cab76633396 Mon Sep 17 00:00:00 2001
From: Luis Alvergue <luis@compiler.la>
Date: Thu, 1 Aug 2024 16:11:40 +0000
Subject: [PATCH] chore(issue_template): update release issue template due to
 tag-based releases

---
 .github/ISSUE_TEMPLATE/release.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/release.yml b/.github/ISSUE_TEMPLATE/release.yml
index c21758979..bd9809b59 100644
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -79,18 +79,14 @@ body:
       description: Complete these items in sequence as the `Regular` release progresses
       options:
         - label: Ensure the `main` branch and secrets are up to date
-        - label: Create a branch called release/version from the source branch
-        - label: Bump the application version
-        - label: Open a PR for the release branch into `main`, merge
         - label: Ensure `test` secrets are up to date
-        - label: Open another PR from `main` to `test`, merge
+        - label: Create an annotated `-rc` tag on `main` (`git tag -a YYYY.0M.R-rcR`)
+        - label: Push the annotated `-rc` tag (`git push origin YYYY.0M.R-rcR`)
         - label: QA the app in test
         - label: Ensure `prod` secrets are up to date
-        - label: Open a PR for the `test` branch into `prod`, merge
+        - label: Create and push an annotated tag on `main`
         - label: Smoke Test the app in prod
         - label: Confirm acceptance of Smoke Tests by adding a comment to this issue
-        - label: Tag the release on the `prod` branch, push the tag to GitHub (see [docs](https://docs.calitp.org/benefits/deployment/release/#5-tag-the-release) for commands)
-        - label: Create a release in GitHub for the tag, generating release notes
         - label: Edit release notes to link back to this Release process issue
         - label: Edit release notes with additional context, images, animations, etc. as-needed
   - type: checkboxes
@@ -99,17 +95,14 @@ body:
       label: Hotfix release checklist
       description: Complete these items in sequence as the `Hotfix` release progresses
       options:
-        - label: Make the hotfix in a branch from `prod`
-        - label: Bump the application version
+        - label: Create a hotfix branch from the latest stable release tag on `main` (`git checkout -b hotfix YYYY.0M.R`)
+        - label: Commit the fixes to the hotfix branch
         - label: Ensure `prod` secrets are up to date
-        - label: Open a PR from the hotfix branch into `prod`, merge
+        - label: Create an annotated tag on the hotfix branch (`git tag -a YYYY.0M.R`)
+        - label: Push the annotated tag (`git push origin YYYY.0M.R`)
         - label: Smoke Test the fix in prod
         - label: Confirm acceptance of Smoke Tests by adding a comment to this issue
-        - label: Tag the release on `prod`, push the tag to GitHub (see [docs](https://docs.calitp.org/benefits/deployment/release/#5-tag-the-release) for commands)
-        - label: Create a release in GitHub for the tag, generating release notes
         - label: Edit release notes to link back to this Release process issue
         - label: Edit release notes with additional context, images, animations, etc. as-needed
-        - label: Create a branch off `main`
-        - label: Open a PR from `prod` into that branch, merge
-        - label: (optional) Adapt hotfix to current state of `main` in that same branch
-        - label: Merge the PR into `main`
+        - label: (optional) Open a PR from the hotfix branch to current state of `main`
+        - label: (optional) Merge the PR into `main`