Merge pull request #576 from NHSDigital/release/2025-04-24

Release/2025 04 24

Author: jameslinnell

.github/workflows/pull-requests.yml

@@ -66,6 +66,8 @@ jobs:
         run: |
           if [[ ${{ env.BRANCH_NAME }} == *"release/"* ]]; then
             echo "workspace=rel-$(echo ${{ env.BRANCH_NAME }} | sed 's/release\///')-${{ env.BRANCH_GITHUB_SHA_SHORT }}" >> $GITHUB_OUTPUT
+          elif [[ ${{ env.BRANCH_NAME }} == *"dependabot/"* ]]; then
+            echo "workspace=ci-$(echo ${{ env.BRANCH_NAME }} | sed -n 's|.*pip/||p' | awk -F- '{ for (i=1;i<=NF;i++) printf substr($i,1,1); print "" }')-${{ env.BRANCH_GITHUB_SHA_SHORT }}" >> $GITHUB_OUTPUT
           else
             echo "workspace=ci-$(echo ${{ env.BRANCH_NAME }} | sed -n 's/.*\/\([^-]*\)-\([^-]*\).*/\1-\2/p' | tr '[:upper:]' '[:lower:]')-${{ env.BRANCH_GITHUB_SHA_SHORT }}" >> $GITHUB_OUTPUT
           fi

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2025-04-24
+- [PI-880] Allow dependabot PRs to pass branch name check
+- Dependabot: Update datamodel-code-generator
+
 ## 2025-04-23
 - [PI-879] Update Billing alarm recipients
 - [PI-880] Allow dependabot PRs to pass branch name check

VERSION

@@ -1 +1 @@
-2025.04.23
+2025.04.24

changelog/2025-04-24.md

@@ -0,0 +1,2 @@
+- [PI-880] Allow dependabot PRs to pass branch name check
+- Dependabot: Update datamodel-code-generator

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "connecting-party-manager"
-version = "2025.04.23"
+version = "2025.04.24"
 description = "Repository for the Connecting Party Manager API and related services"
 authors = ["NHS England"]
 license = "LICENSE.md"
@@ -40,7 +40,7 @@ hypothesis = "^6.87.3"
 aws-lambda-powertools = { extras = ["aws-sdk"], version = "^2.26.0" }
 parse = "^1.19.1"
 pytest-mock = "^3.12.0"
-datamodel-code-generator = "^0.28.1"
+datamodel-code-generator = "^0.30.0"
 pyyaml = "^6.0.1"
 proxygen-cli = "^2.1.14"
 moto = "^5.0.1"