ci(releasing): updates per templates pointing to latest on main

Signed-off-by: Vaughn Dice <[email protected]>

.github/workflows/release.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - "v[0-9]+.[0-9]+"
     tags:
       - "v*"
 
@@ -289,7 +290,14 @@ jobs:
 
       - name: Set the spin tag
         shell: bash
-        run: echo "SPIN_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+        run: |
+          echo "SPIN_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+
+      - name: Set the PR base branch
+        shell: bash
+        run: |
+          IFS=. read -r major minor patch <<< "${{ env.SPIN_TAG }}"
+          echo "RELEASE_BRANCH=$major.$minor" >> $GITHUB_ENV
 
       - name: Change sdk version
         shell: bash
@@ -312,7 +320,7 @@ jobs:
           title: "feat(templates): update sdk to ${{ env.SPIN_TAG }}"
           body: Update the SDK version used by the templates
           branch: update-sdk-${{ env.SPIN_TAG }}
-          base: main
+          base: ${{ env.RELEASE_BRANCH }}
           delete-branch: true
           committer: fermybot <[email protected]>
           author: fermybot <[email protected]>

docs/content/release-process.md

@@ -14,7 +14,6 @@ To cut a major / minor release of Spin, you will need to do the following:
 
 1. Switch to the release branch locally and update versions (e.g. `1.1.0-pre0` could `1.1.0`).
    - Bump the version in Spin's `Cargo.toml`
-   - Update SDK_VERSION in `templates/Makefile`
    - Run `make build` so that `Cargo.lock` and other associated files are updated
 
    PR these changes to the release branch ensuring that pull request has a base corresponding to the release branch (e.g. `v1.1`).
@@ -62,7 +61,6 @@ $ ./.github/gh-backport.sh <pull-request> <branch-name>
 
 1. Switch to the release branch locally and update versions (e.g. `1.1.0-pre0` could `1.1.1`).
    - Bump the version in Spin's `Cargo.toml`
-   - Update SDK_VERSION in `templates/Makefile`
    - Run `make build` so that `Cargo.lock` and other associated files are updated
 
    PR these changes to the release branch ensuring that pull request has a base corresponding to the release branch (e.g. `v1.1`).

templates/Makefile

@@ -1,4 +1,4 @@
-SDK_VERSION ?= v2.0.0-pre0
+SDK_VERSION ?= v0.0.0
 
 bump-versions: bump-go-versions bump-rust-versions