Merge pull request #414 from NHSDigital/release/2024-11-19

Release/2024-11-19

Author: jameslinnell

.github/workflows/on-pr-close.yml

@@ -26,9 +26,17 @@ jobs:
     runs-on: [self-hosted, ci]
     needs: [parse-secrets]
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Branch
+        id: checkout-build-branch
+        uses: actions/checkout@v4
+        continue-on-error: true
         with:
-          ref: ${{ env.BRANCH_NAME || 'main' }}
+          ref: ${{ env.BRANCH_NAME }}
+      - name: Fallback to main
+        if: steps.checkout-build-branch.outcome == 'failure'
+        uses: actions/checkout@v4
+        with:
+          ref: main
       - uses: ./.github/actions/make/
         with:
           command: build
@@ -39,9 +47,17 @@ jobs:
     runs-on: [self-hosted, ci]
     needs: [parse-secrets, build-base]
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Branch for destroy
+        id: checkout-destroy-branch
+        uses: actions/checkout@v4
+        continue-on-error: true
+        with:
+          ref: ${{ env.BRANCH_NAME }}
+      - name: Fallback to main for destroy
+        if: steps.checkout-destroy-branch.outcome == 'failure'
+        uses: actions/checkout@v4
         with:
-          ref: ${{ env.BRANCH_NAME || 'main' }}
+          ref: main
           fetch-depth: 0
       - name: Remove PR workspaces
         uses: ./.github/actions/make/

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2024-11-19
+- [PI-601] Workspace destroy, use main branch as fallback
+
 ## 2024-11-18
 - [PI-601] Workspace destroy, use main branch if branch no longer exists
 

VERSION

@@ -1 +1 @@
-2024.11.18
+2024.11.19

changelog/2024-11-19.md

@@ -0,0 +1 @@
+- [PI-601] Workspace destroy, use main branch as fallback

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2024.11.18"
+version = "2024.11.19"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"