From ab17e89a80e0aa320445e3de0eb16994a64c2bcd Mon Sep 17 00:00:00 2001
From: MatthewPopat-NHS <matthew.popat1@nhs.net>
Date: Thu, 15 Jan 2026 15:27:21 +0000
Subject: [PATCH] Updated to merged version of common workflows

---
 .github/workflows/ci.yml           |  7 +++----
 .github/workflows/pull_request.yml | 11 +++++------
 .github/workflows/release.yml      |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0179094..6f5fa53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
           TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
           echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     needs: [get_asdf_version, get_commit_id]
     with:
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -53,13 +53,12 @@ jobs:
 
   tag_release:
     needs: [quality_checks, get_commit_id, get_asdf_version]
-    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
+    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     with:
       dry_run: true
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
       branch_name: main
-      publish_package: false
-      publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
+      publish_packages: packages/cdkConstructs,packages/deploymentUtils
       tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
     secrets: inherit
 
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ff61d50..1388b6b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   dependabot-auto-approve-and-merge:
     needs: quality_checks
-    uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@9791a77de7b005056b4ddfb9789306f5179f53da
+    uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     secrets:
       AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
       AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,9 +32,9 @@ jobs:
           TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
           echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
   pr_title_format_check:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@9791a77de7b005056b4ddfb9789306f5179f53da
+    uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     needs: [get_asdf_version, get_commit_id]
     with:
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -109,12 +109,11 @@ jobs:
 
   tag_release:
     needs: [get_commit_id, get_asdf_version]
-    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
+    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     with:
       dry_run: true
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
       branch_name: ${{ github.event.pull_request.head.ref }}
-      publish_package: false
-      publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
+      publish_packages: packages/cdkConstructs,packages/deploymentUtils
       tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57e0b17..7943167 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
           TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
           echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     needs: [get_asdf_version, get_commit_id]
     with:
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -54,13 +54,12 @@ jobs:
 
   tag_release:
     needs: [quality_checks, get_commit_id, get_asdf_version]
-    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
+    uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
     with:
       dry_run: false
       asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
       branch_name: main
-      publish_package: false
-      publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
+      publish_packages: packages/cdkConstructs,packages/deploymentUtils
       tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
     secrets: inherit