From 1923231d06da4087d46726533c23fb0a5dff4f49 Mon Sep 17 00:00:00 2001 From: Rowan Gill Date: Tue, 18 Mar 2025 16:00:04 +0000 Subject: [PATCH 1/2] feature/PI-858-fix_pr_boo_boo fixed PR --- .github/workflows/pull-requests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 7937f89f3..443ef8dcb 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -9,8 +9,8 @@ permissions: env: BASE_CACHE_SUFFIX: base - BASE_BRANCH_NAME: main - BRANCH_NAME: feature/PI-855-add_sonar_code_coverage + BASE_BRANCH_NAME: ${{ github.event.pull_request.base.ref }} + BRANCH_NAME: ${{ github.event.pull_request.head.ref }} CI_ROLE_NAME: ${{ secrets.CI_ROLE_NAME }} BRANCH_GITHUB_SHA_SHORT: $(echo ${{ github.event.pull_request.head.sha }} | cut -c 1-7) TF_CLI_ARGS: -no-color From 7be0923848c63101f7b1c87d1645d787075aa61b Mon Sep 17 00:00:00 2001 From: Rowan Gill Date: Wed, 19 Mar 2025 10:37:35 +0000 Subject: [PATCH 2/2] release/2025-03-19 made release branch --- CHANGELOG.md | 3 +++ VERSION | 2 +- changelog/2025-03-19.md | 1 + pyproject.toml | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelog/2025-03-19.md diff --git a/CHANGELOG.md b/CHANGELOG.md index aa40baa96..0ee7c6dd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2025-03-19 +- [PI-858] Fix PR action + ## 2025-03-18 - [PI-761] Product Team name cannot be blank - [PI-850] Readme Review diff --git a/VERSION b/VERSION index 2e48bd7f0..c2b9df159 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2025.03.18 +2025.03.19 diff --git a/changelog/2025-03-19.md b/changelog/2025-03-19.md new file mode 100644 index 000000000..3d3a92f60 --- /dev/null +++ b/changelog/2025-03-19.md @@ -0,0 +1 @@ +- [PI-858] Fix PR action diff --git a/pyproject.toml b/pyproject.toml index fba0464aa..4d67769b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "connecting-party-manager" -version = "2025.03.18" +version = "2025.03.19" description = "Repository for the Connecting Party Manager API and related services" authors = ["NHS England"] license = "LICENSE.md"