From 0b05ebaaa6e0340f5e1cb3d860b2d68218aa785d Mon Sep 17 00:00:00 2001
From: oliverbeumkes-nhs <oliver.beumkes2@nhs.net>
Date: Thu, 19 Mar 2026 12:20:08 +0000
Subject: [PATCH 1/4] [PRM-691] Update tool to automated task to run on new tag
 push

---
 ...release.yml => automated-tag-services.yml} | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)
 rename .github/workflows/{tool-create-release.yml => automated-tag-services.yml} (74%)

diff --git a/.github/workflows/tool-create-release.yml b/.github/workflows/automated-tag-services.yml
similarity index 74%
rename from .github/workflows/tool-create-release.yml
rename to .github/workflows/automated-tag-services.yml
index ef290140..ec1e346d 100644
--- a/.github/workflows/tool-create-release.yml
+++ b/.github/workflows/automated-tag-services.yml
@@ -1,21 +1,11 @@
-name: "TOOL: Create Release"
+name: "Z-AUTOMATED: Rebuild, Deploy and Re-tag all Services"
 
-run-name: ${{ inputs.tag }}
+run-name: ${{ github.ref_name }}
 
 on:
-  workflow_call:
-    inputs:
-      tag:
-        description: "Tag to release (e.g. 1.0.0)"
-        type: string
-        required: true
-      environment:
-        default: dev
-        type: string
-        required: true
-    secrets:
-      IAM_ROLE:
-        required: true
+  push:
+    tags:
+      - '*.*.*'
 
 permissions:
   id-token: write
@@ -23,11 +13,11 @@ permissions:
 
 jobs:
   create_release:
-    name: Create Release
+    name: Run Full Deployment and Re-tag Services
     runs-on: ubuntu-latest
-    environment: ${{ inputs.environment }}
+    environment: dev
     env:
-      tag: ${{ inputs.tag }}
+      tag: ${{ github.ref_name }}
     steps:
       - name: Validate Tag Format
         run: |
@@ -51,13 +41,6 @@ jobs:
           fetch-depth: 0
           repository: NHSDigital/orphaned-record-continuity
 
-      - name: Create GitHub tag
-        run: |
-          git config --global user.name "github-actions"
-          git config --global user.email "github@github.com"
-          git tag $tag
-          git push origin $tag
-
       - name: Full Deployment
         uses: ./.github/workflows/full-deployment.yml
 

From 352b3da07aed1d836331056abeca9a06ccabc6eb Mon Sep 17 00:00:00 2001
From: oliverbeumkes-nhs <oliver.beumkes2@nhs.net>
Date: Thu, 19 Mar 2026 13:30:06 +0000
Subject: [PATCH 2/4] Re-introduce workflow_dispatch

---
 ...tomated-tag-services.yml => tool-tag-services.yml} | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 rename .github/workflows/{automated-tag-services.yml => tool-tag-services.yml} (90%)

diff --git a/.github/workflows/automated-tag-services.yml b/.github/workflows/tool-tag-services.yml
similarity index 90%
rename from .github/workflows/automated-tag-services.yml
rename to .github/workflows/tool-tag-services.yml
index ec1e346d..a8316567 100644
--- a/.github/workflows/automated-tag-services.yml
+++ b/.github/workflows/tool-tag-services.yml
@@ -1,11 +1,14 @@
-name: "Z-AUTOMATED: Rebuild, Deploy and Re-tag all Services"
+name: "TOOL: Rebuild, Deploy and Re-tag all Services"
 
 run-name: ${{ github.ref_name }}
 
 on:
-  push:
-    tags:
-      - '*.*.*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release Tag (format: X.Y.Z, e.g. 1.0.0)'
+        required: true
+        default: '1.0.0'
 
 permissions:
   id-token: write

From 7e65da395f1291f5611c545b577054e11fd408ac Mon Sep 17 00:00:00 2001
From: oliverbeumkes-nhs <oliver.beumkes2@nhs.net>
Date: Thu, 19 Mar 2026 13:32:28 +0000
Subject: [PATCH 3/4] Re-introduce github tagging steps

---
 .github/workflows/tool-tag-services.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tool-tag-services.yml b/.github/workflows/tool-tag-services.yml
index a8316567..228ab584 100644
--- a/.github/workflows/tool-tag-services.yml
+++ b/.github/workflows/tool-tag-services.yml
@@ -1,6 +1,6 @@
-name: "TOOL: Rebuild, Deploy and Re-tag all Services"
+name: "TOOL: Create Release"
 
-run-name: ${{ github.ref_name }}
+run-name: ${{ inputs.tag }}
 
 on:
   workflow_dispatch:
@@ -8,7 +8,6 @@ on:
       tag:
         description: 'Release Tag (format: X.Y.Z, e.g. 1.0.0)'
         required: true
-        default: '1.0.0'
 
 permissions:
   id-token: write
@@ -20,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: dev
     env:
-      tag: ${{ github.ref_name }}
+      tag: ${{ inputs.tag }}
     steps:
       - name: Validate Tag Format
         run: |
@@ -44,6 +43,13 @@ jobs:
           fetch-depth: 0
           repository: NHSDigital/orphaned-record-continuity
 
+      - name: Create GitHub Tag
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git tag $tag
+          git push origin $tag
+
       - name: Full Deployment
         uses: ./.github/workflows/full-deployment.yml
 

From 85a1ac9ce9bac723acb6c3f9b17e7ea27d224866 Mon Sep 17 00:00:00 2001
From: oliverbeumkes-nhs <oliver.beumkes2@nhs.net>
Date: Thu, 19 Mar 2026 13:34:47 +0000
Subject: [PATCH 4/4] Rename file back to tool-create-release

---
 .../workflows/{tool-tag-services.yml => tool-create-release.yml}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{tool-tag-services.yml => tool-create-release.yml} (100%)

diff --git a/.github/workflows/tool-tag-services.yml b/.github/workflows/tool-create-release.yml
similarity index 100%
rename from .github/workflows/tool-tag-services.yml
rename to .github/workflows/tool-create-release.yml