Add check to see if auto tagging will work

.github/pull_request_template.md

@@ -12,6 +12,7 @@ Please include:
 Please select the option below that is most relevant from the list below. This
 will be used to generate the next tag version name during auto-tagging.
 
+- [ ] Skip auto-tagging
 - [ ] Patch
 - [ ] Minor version
 - [ ] Major version

.github/workflows/auto-tagging-failsafe.yml

@@ -0,0 +1,33 @@
+name: Auto-Tagging Fail Safe
+
+on:
+  pull_request:
+    types: [edited]
+    branches:
+      - main
+
+permissions: read-all
+
+# https://github.com/marketplace/actions/docker-layer-caching
+jobs:
+  check-auto-tagging-will-work:
+    if: ${{ ! startsWith(github.ref, 'refs/tags') && ! startsWith(github.ref, 'refs/heads/main') }}
+    runs-on: ubuntu-latest
+    # User controlled input needs to be santitised beforehand e.g., by adding an
+    # intermediate env var to prevent the workflow being exposed to a critical
+    # command injection attack
+    env:
+      PR_BODY: "${{ github.event.pull_request.body }}"
+    steps:
+      - name: Determine new tag version from PR body
+        id: determine_next_tag_from_pr
+        uses: climatepolicyradar/get-next-tag-from-pr-body@v2
+        with:
+          pr_body: "${{ env.PR_BODY }}"
+          pr_number: "${{ github.event.pull_request.number }}"
+
+      - name: Next tag found?
+        run: |
+          if [[ -z "${{ steps.determine_next_tag_from_pr.outputs.new_tag }}" ]]; then
+            exit 1;
+          fi

.github/workflows/ci-cd.yml

@@ -2,7 +2,7 @@ name: CI/CD
 
 on:
   push:
-    tags: ["v*"]
+    tags: [v*]
     branches:
       - main
   pull_request:
@@ -37,11 +37,8 @@ jobs:
       - name: Build docker compose
         run: make build_dev
 
-      - name: Run Unit Tests
-        run: make unit_test
-
-      - name: Run Integration Tests
-        run: make integration_test
+      - name: Run Unit & Integration Tests
+        run: make test
 
   build:
     if: ${{ ! startsWith(github.ref, 'refs/tags') }}
@@ -117,6 +114,7 @@ jobs:
 
   release:
     needs: tag
+    if: ${{ needs.tag.outputs.new_tag != 'Skip' }}
     permissions:
       contents: write
     uses: climatepolicyradar/reusable-workflows/.github/workflows/release.yml@main