From 3b7f811876130da1d7f8f0b30cd237c8d792e7a3 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:04:52 +0100
Subject: [PATCH] Tag latest and stable only after versioning

---
 .github/workflows/release_tag.yml | 39 ----------------
 .github/workflows/versioning.yml  | 78 +++++++++++++++++++++++++------
 2 files changed, 63 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/release_tag.yml

diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
deleted file mode 100644
index 2d4c6de..0000000
--- a/.github/workflows/release_tag.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This GitHub Actions workflow updates the "stable" and "latest" Git tags
-# to point to the latest commit on the main branch whenever code is merged.
-# It performs the following steps:
-# 1. Checks out the repository code with full history
-# 2. Configures Git with a generic user for the action
-# 3. Moves and forcibly pushes the "stable" and "latest" tags to align with
-#    the latest main branch commit
----
-name: Update Tags
-
-on:  # yamllint disable-line rule:truthy
-  push:
-    branches:
-      - main
-
-jobs:
-  update-tags:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Git
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
-      - name: Move and push tags
-        run: |
-          echo "Creating/updating stable and latest tags pointing to latest main commit"
-          git tag -fa stable -m "Update stable tag to latest main"
-          git tag -fa latest -m "Update latest tag to latest main"
-          git push origin stable latest --force
-...
diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index 2e49b1a..1c019a0 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -1,6 +1,9 @@
-# Workflow for managing versioning and tagging
+# This GitHub Actions workflow handles version bumping and tag updates.
+# It can be triggered either by:
+# 1. Pushing to main branch - automatically bumps version and updates tags
+# 2. Manual dispatch - allows independent control over stable and latest tags
 ---
-name: Version Bump and Tag
+name: Version and Tags
 
 on:  # yamllint disable-line rule:truthy
   push:
@@ -9,34 +12,79 @@ on:  # yamllint disable-line rule:truthy
     paths-ignore:
       - '**/VERSION'
       - '**/VERSION_YAML'
+
   workflow_dispatch:
     inputs:
       update_stable:
         description: "Update stable tag?"
         required: true
-        default: "false"
+        default: false
+        type: boolean
+      update_latest:
+        description: "Update latest tag?"
+        required: true
+        default: false
+        type: boolean
 
 jobs:
-  versioning:
+  version-and-tag:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: "actions/checkout@v4"
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Git
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
 
-      - name: Bump Version
-        run: |
-          chmod +x "./versioning/bump_version.sh"
-          "./versioning/bump_version.sh"
+      - name: Bump version and push tag
+        id: version
+        uses: mathieudutour/github-tag-action@v6.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          release_branches: main
+          default_bump: patch
+          tag_prefix: ""
+          dry_run: true
 
-      - name: Push Changes and Tags
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Update version in files
+        if: steps.version.outputs.new_tag
         run: |
-          git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" main
-          git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" --tags
+          chmod +x ./bump_version.sh
+          ./bump_version.sh ${{ steps.version.outputs.new_tag }}
+          git add .
+          git commit -m "chore: bump version to ${{ steps.version.outputs.new_tag }}"
+          git push
+
+      - name: Create version tag
+        if: steps.version.outputs.new_tag
+        run: |
+          echo "Creating version tag ${{ steps.version.outputs.new_tag }}"
+          git tag -fa ${{ steps.version.outputs.new_tag }} -m "Version ${{ steps.version.outputs.new_tag }}"
+          git push origin ${{ steps.version.outputs.new_tag }} --force
+
+      - name: Update stable tag
+        if: |
+          steps.version.outputs.new_tag && (
+            github.event_name == 'workflow_dispatch' && inputs.update_stable ||
+            github.event_name == 'push'
+          )
+        run: |
+          echo "Updating stable tag to point to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa stable -m "Update stable tag to ${{ steps.version.outputs.new_tag }}"
+          git push origin stable --force
+
+      - name: Update latest tag
+        if: |
+          steps.version.outputs.new_tag && (
+            github.event_name == 'workflow_dispatch' && inputs.update_latest ||
+            github.event_name == 'push'
+          )
+        run: |
+          echo "Updating latest tag to point to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa latest -m "Update latest tag to ${{ steps.version.outputs.new_tag }}"
+          git push origin latest --force
 ...