chore: minor fixes on automated releases

Signed-off-by: Joris Mancini <[email protected]>

Author: TheMaskedTurtle

.github/workflows/patch.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       releaseVersion:
-        description: Patch version (vX.X)
+        description: version to patch (vX.X)
         required: true
 
 jobs:
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
           token: ${{ steps.app-token.outputs.token }}
 
-      - name: Extract tag versions
+      - name: Parse release version
         run: |
           regex="^v([0-9]+)\.([0-9]+)$"
           if [[ ${{ github.event.inputs.releaseVersion }} =~ $regex ]]

.github/workflows/release.yml

@@ -6,8 +6,8 @@ on:
       releaseVersion:
         description: Release version (vX.X)
         required: true
-      commitSha:
-        description: SHA of the commit from where to release
+      gitReference:
+        description: SHA of the commit from where to release or branch name
         required: true
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
           token: ${{ steps.app-token.outputs.token }}
 
-      - name: Extract tag versions
+      - name: Parse release version
         run: |
           regex="^v([0-9]+)\.([0-9]+)$"
           if [[ ${{ github.event.inputs.releaseVersion }} =~ $regex ]]
@@ -57,7 +57,7 @@ jobs:
 
       - name: Checkout with new branch
         run: |
-          git checkout -b release-v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }} ${{ github.event.inputs.commitSha }}
+          git checkout -b release-v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }} ${{ github.event.inputs.gitReference }}
 
       - name: Change Maven version to release version
         run: mvn --batch-mode versions:set -DgenerateBackupPoms=false -DnewVersion=${{ env.GITHUB_SHORT_VERSION }}
@@ -102,24 +102,20 @@ jobs:
         run: |
           echo "CURRENT_MAVEN_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
 
-      - name: Extract tag versions
+      - name: Extract current version
         run: |
           regex="(.*)-SNAPSHOT"
           if [[ ${{ env.CURRENT_MAVEN_VERSION }} =~ $regex ]]
           then
             echo "CURRENT_RELEASE_VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV
           fi
 
-      - name: Increment minor version
-        run: |
-          minor=${{ env.GITHUB_MINOR_VERSION }}
-          ((minor++))
-          echo "GITHUB_MINOR_VERSION=${minor}" >> $GITHUB_ENV
-
       - name: Update SNAPSHOT version on main
         if: env.CURRENT_RELEASE_VERSION == env.GITHUB_SHORT_VERSION
         run: |
-          mvn --batch-mode versions:set -DgenerateBackupPoms=false -DnewVersion=${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}.0-SNAPSHOT
+          minor=${{ env.GITHUB_MINOR_VERSION }}
+          ((++minor))
+          mvn --batch-mode versions:set -DgenerateBackupPoms=false -DnewVersion=${{ env.GITHUB_MAJOR_VERSION }}.$minor.0-SNAPSHOT
           git add .
-          git commit -m "Update SNAPSHOT version to v${{ env.GITHUB_MAJOR_VERSION }}.${{ env.GITHUB_MINOR_VERSION }}.0"
+          git commit -m "Update SNAPSHOT version to v${{ env.GITHUB_MAJOR_VERSION }}.$minor.0"
           git push