Prepare release job v2

Author: DeLaGuardo

.github/workflows/release.yaml

@@ -6,7 +6,7 @@ on:
       - '*'
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
@@ -25,8 +25,12 @@ jobs:
         run: |
           git fetch origin main --depth=1
 
-          if ! git merge-base --is-ancestor "$GITHUB_SHA" "origin/main"; then
-            echo "Tag $GITHUB_REF_NAME does not point to a commit on origin/main"
+          main_sha="$(git rev-parse origin/main)"
+
+          if [[ "$GITHUB_SHA" != "$main_sha" ]]; then
+            echo "Tag $GITHUB_REF_NAME must point to the current origin/main tip"
+            echo "tag sha:  $GITHUB_SHA"
+            echo "main sha: $main_sha"
             exit 1
           fi
 
@@ -40,8 +44,8 @@ jobs:
             exit 1
           fi
 
-          if [[ ! "$version" =~ ^[0-9]+(\.[0-9]+){2}([.-][0-9A-Za-z]+)*$ ]]; then
-            echo "Tag $GITHUB_REF_NAME does not look like a release version"
+          if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Tag $GITHUB_REF_NAME must be in the form vX.Y.Z"
             exit 1
           fi
 
@@ -100,7 +104,7 @@ jobs:
           RELEASE_VERSION: ${{ needs.verify-release-tag.outputs.version }}
         run: |
           perl -0pi -e 's/\(defproject\s+dev\.dotfox\/trapperkeeper-webserver-jetty12\s+"[^"]+"/(defproject dev.dotfox\/trapperkeeper-webserver-jetty12 "'"$RELEASE_VERSION"'"/' project.clj
-          rg '^\(defproject ' project.clj
+          sed -n '1p' project.clj
 
       - name: Prepare package
         run: lein with-profile +provided do clean, jar
@@ -121,3 +125,48 @@ jobs:
           export DEPLOY_PASSWORD="${DEPLOY_PASSWORD_OVERRIDE:-$DEFAULT_DEPLOY_PASSWORD}"
 
           lein with-profile +provided deploy releases
+
+  bump-snapshot-version:
+    name: Bump main to next snapshot
+    needs: [verify-release-tag, publish-package]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out main
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+
+      - name: Verify main did not move
+        run: |
+          git fetch origin main
+
+          main_sha="$(git rev-parse origin/main)"
+
+          if [[ "$main_sha" != "$GITHUB_SHA" ]]; then
+            echo "origin/main moved during the release run; refusing to bump version automatically"
+            echo "tag sha:  $GITHUB_SHA"
+            echo "main sha: $main_sha"
+            exit 1
+          fi
+
+      - name: Set next snapshot version
+        env:
+          RELEASE_VERSION: ${{ needs.verify-release-tag.outputs.version }}
+        run: |
+          IFS='.' read -r major minor patch <<< "$RELEASE_VERSION"
+          next_patch=$((patch + 1))
+          next_version="${major}.${minor}.${next_patch}-SNAPSHOT"
+
+          perl -0pi -e 's/\(defproject\s+dev\.dotfox\/trapperkeeper-webserver-jetty12\s+"[^"]+"/(defproject dev.dotfox\/trapperkeeper-webserver-jetty12 "'"$next_version"'"/' project.clj
+          sed -n '1p' project.clj
+
+      - name: Commit next snapshot version
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add project.clj
+          git commit -m "Prepare next development version"
+
+      - name: Push snapshot bump to main
+        run: git push origin HEAD:main