Merge pull request #410 from NHSDigital/release/2024-11-18

jameslinnell · web-flow · commit 267f8dcc45e5 · 2024-11-18T14:13:47.000Z
Release/2024 11 18
diff --git a/.github/workflows/on-pr-close.yml b/.github/workflows/on-pr-close.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ env.BRANCH_NAME }}
+          ref: ${{ env.BRANCH_NAME || 'main' }}
       - uses: ./.github/actions/make/
         with:
           command: build
@@ -41,7 +41,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{ env.BRANCH_NAME }}
+          ref: ${{ env.BRANCH_NAME || 'main' }}
           fetch-depth: 0
       - name: Remove PR workspaces
         uses: ./.github/actions/make/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2024-11-18
+- [PI-601] Workspace destroy, use main branch if branch no longer exists
+
 ## 2024-11-13
 - [PI-617] Stream bulk LDIF into blocks of party key
 - [PI-527] Swagger fix
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2024.11.13
+2024.11.18
diff --git a/changelog/2024-11-18.md b/changelog/2024-11-18.md
@@ -0,0 +1 @@
+- [PI-601] Workspace destroy, use main branch if branch no longer exists
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2024.11.13"
+version = "2024.11.18"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- [PI-601] Workspace destroy, use main branch if branch no longer exists`