chore: prepare for release of v0.0.5 (#33)

* update version to 0.0.5

* add script for release maintenance

* simplify release workflow

* workflow to create tag on PR merge

Author: binarycodes

.github/workflows/release-workflow.yml

@@ -18,18 +18,9 @@ jobs:
 
   prepare-release:
     needs: extract-version
-
-    name: "tagged release"
     runs-on: ubuntu-latest
 
-    outputs:
-      updated-sha: ${{ steps.get-latest-sha.outputs.updated-sha }}
-
     steps:
-      - name: "display tag name"
-        run: |
-            echo "found tag name ${{ needs.extract-version.outputs.clean_version }}"
-
       - name: checkout sources
         uses: actions/checkout@v4
 
@@ -39,50 +30,11 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
 
-      - name: "update version to tag"
-        run: |
-          mvn versions:set -DnewVersion=${{ needs.extract-version.outputs.clean_version }} -DprocessAllModules
-          mvn versions:update-properties -DincludeProperties=ssh-signer-common-lib.version
-          mvn versions:commit
-
-      - name: commit new version
-        id: get-latest-sha
-        run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Actions"
-
-          # create a temporary branch from the tag
-          git switch -c temp-from-tag
-
-          git add .
-          git commit -m "Update version to ${{ needs.extract-version.outputs.clean_version }}"
-
-          # force move the tag to the new commit
-          git tag -f ${{ github.ref_name }}
-          git push origin ${{ github.ref_name }} --force
-
-          # merge to main
-          git fetch origin
-          git switch main
-          git merge temp-from-tag --no-ff -m "Merge tag ${{ github.ref_name }} changes into main"
-
-          git push origin main
-
-          # cleanup temp branch
-          git branch -d temp-from-tag
-
-          NEW_SHA=$(git rev-parse main)
-          echo "updated-sha=$NEW_SHA" >> $GITHUB_OUTPUT
-
-      - name: debug the SHA
-        run: |
-          echo "The SHA exported is: ${{ steps.get-latest-sha.outputs.updated-sha }}"
-
   docker-build:
     needs: prepare-release
     uses: ./.github/workflows/ssh-key-signer-server-docker.yml
     with:
-      sha: ${{ needs.prepare-release.outputs.updated-sha }}
+      sha: ${{ github.sha }}
     secrets: inherit
 
   go-build:
@@ -91,7 +43,7 @@ jobs:
     with:
       service: go-ssh-keysign
       artifactVersion: ${{ needs.extract-version.outputs.clean_version }}
-      sha: ${{ needs.prepare-release.outputs.updated-sha }}
+      sha: ${{ github.sha }}
 
   create-release:
     needs: [docker-build, go-build]
@@ -102,7 +54,7 @@ jobs:
         id: create_release
         uses: actions/create-release@v1
         with:
-          tag_name: ${{ github.ref }}  # The tag that triggered the release
+          tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           draft: true
           prerelease: true

.github/workflows/tag-on-merge.yml

@@ -0,0 +1,53 @@
+name: 'create tag on release prepare PR merge'
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+jobs:
+  tagging:
+    if: github.event.pull_request.merged == true
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: extract tag name from branch
+        id: tag_extraction
+        run: |
+          # Get the head branch name of the PR (e.g., 'prepare-v0.0.5')
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+
+          # Check if the branch name starts with 'prepare-v'
+          if [[ $BRANCH_NAME =~ ^prepare-v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            # Extract the version part (e.g., 'v0.0.5') by removing 'prepare-'
+            VERSION_TAG=$(echo "$BRANCH_NAME" | sed 's/^prepare-//')
+            echo "::set-output name=version_tag::$VERSION_TAG"
+            echo "Extracted tag: $VERSION_TAG"
+          else
+            echo "Branch name $BRANCH_NAME does not match the 'prepare-vX.Y.Z' convention. Skipping tag creation."
+            # Set an empty output to skip the next steps
+            echo "::set-output name=version_tag::"
+          fi
+
+      - name: create and push tag
+        if: steps.tag_extraction.outputs.version_tag != ''
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const tag = steps.tag_extraction.outputs.version_tag;
+
+            console.log(`Creating tag ${tag}`);
+
+            // Create the tag using the GitHub API
+            await github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: `refs/tags/${tag}`,
+              sha: context.sha
+            });
+
+            console.log(`Successfully created tag ${tag}`);

server/pom.xml

@@ -7,7 +7,7 @@
     <groupId>io.binarycodes.homelab</groupId>
     <artifactId>ssh-signer-mono</artifactId>
     <name>SSH KeySigner</name>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 
     <packaging>pom</packaging>
 

server/ssh-key-signer-server/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.binarycodes.homelab</groupId>
     <artifactId>ssh-key-signer-server</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <packaging>jar</packaging>
 
     <name>Server - SSH Key Signer</name>
@@ -14,7 +14,7 @@
     <properties>
         <java.version>21</java.version>
         <vaadin.version>24.9.2</vaadin.version>
-        <ssh-signer-common-lib.version>0.0.4</ssh-signer-common-lib.version>
+        <ssh-signer-common-lib.version>0.0.5</ssh-signer-common-lib.version>
     </properties>
 
     <parent>

server/ssh-signer-common-lib/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.binarycodes.homelab</groupId>
     <artifactId>ssh-signer-common-lib</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
 
     <name>Common Library - SSH Key Signer</name>
 

update_app_version.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+EXIT_IF_DIRTY=false
+
+if [ -n "$(git status --porcelain -uall)" ]; then
+  echo "Working directory is dirty (tracked changes OR untracked files)."
+  $EXIT_IF_DIRTY && exit 1
+fi
+
+cd ./server
+
+current_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+
+read -p "Current version is [$current_version] Please enter the next version : " version
+
+branch_name="prepare-v${version}"
+git switch -c ${branch_name}
+
+mvn versions:set -DnewVersion=${version} -DprocessAllModules
+mvn versions:update-properties -DincludeProperties=ssh-signer-common-lib.version
+mvn versions:commit
+
+git add .
+git commit -S -m "update version to $version"
+git push --set-upstream origin ${branch_name}
+
+gh auth status -h github.com -a > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+    echo "GitHub CLI is logged in. Proceeding..."
+else
+    echo "GitHub CLI is NOT logged in. Running gh auth login..."
+    gh auth login -h github.com -p ssh --skip-ssh-key -w
+fi
+
+gh pr create \
+    --base main \
+    --head ${branch_name} \
+    --title "chore: prepare for release of v${version}" \
+    --body "This PR is in preparationg for release of version ${version}." \