From 3f254cb4599bf7706194ba94304d44e7f6a5c484 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Thu, 23 Apr 2026 13:27:48 +0100 Subject: [PATCH 1/2] CCM-15317: Updating to use new shared-module action --- .github/workflows/cicd-1-pull-request.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml index b87c4e93..e6ba0b99 100644 --- a/.github/workflows/cicd-1-pull-request.yaml +++ b/.github/workflows/cicd-1-pull-request.yaml @@ -14,6 +14,20 @@ concurrency: cancel-in-progress: true jobs: + check-pr-title: + name: "Check PR title" + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - name: "Check PR title format" + if: github.event_name == 'pull_request' + uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@4e781d1d72739015821a380871aa5a66d070177c # 3.1.0 + with: + title: ${{ github.event.pull_request.title }} + - name: "Skip on non-PR events" + if: github.event_name != 'pull_request' + run: echo "Skipping PR title check for ${GITHUB_EVENT_NAME}" metadata: name: "Set CI/CD metadata" runs-on: ubuntu-latest @@ -101,7 +115,7 @@ jobs: make list-variables commit-stage: # Recommended maximum execution time is 2 minutes name: "Commit stage" - needs: [metadata] + needs: [check-pr-title, metadata] uses: ./.github/workflows/stage-1-commit.yaml with: build_datetime: "${{ needs.metadata.outputs.build_datetime }}" From 3619adddbf8a0d9e4565a126b0ceb0c03cdcc9a9 Mon Sep 17 00:00:00 2001 From: damientobin1 Date: Fri, 24 Apr 2026 11:40:38 +0100 Subject: [PATCH 2/2] CCM-15317: add PR title check workflow; revert cicd-1 to main --- .github/workflows/cicd-1-pull-request.yaml | 16 +--------------- .github/workflows/cicd-4-pr-title-check.yaml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/cicd-4-pr-title-check.yaml diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml index e6ba0b99..b87c4e93 100644 --- a/.github/workflows/cicd-1-pull-request.yaml +++ b/.github/workflows/cicd-1-pull-request.yaml @@ -14,20 +14,6 @@ concurrency: cancel-in-progress: true jobs: - check-pr-title: - name: "Check PR title" - runs-on: ubuntu-latest - permissions: - contents: read - steps: - - name: "Check PR title format" - if: github.event_name == 'pull_request' - uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@4e781d1d72739015821a380871aa5a66d070177c # 3.1.0 - with: - title: ${{ github.event.pull_request.title }} - - name: "Skip on non-PR events" - if: github.event_name != 'pull_request' - run: echo "Skipping PR title check for ${GITHUB_EVENT_NAME}" metadata: name: "Set CI/CD metadata" runs-on: ubuntu-latest @@ -115,7 +101,7 @@ jobs: make list-variables commit-stage: # Recommended maximum execution time is 2 minutes name: "Commit stage" - needs: [check-pr-title, metadata] + needs: [metadata] uses: ./.github/workflows/stage-1-commit.yaml with: build_datetime: "${{ needs.metadata.outputs.build_datetime }}" diff --git a/.github/workflows/cicd-4-pr-title-check.yaml b/.github/workflows/cicd-4-pr-title-check.yaml new file mode 100644 index 00000000..5b42a8f1 --- /dev/null +++ b/.github/workflows/cicd-4-pr-title-check.yaml @@ -0,0 +1,20 @@ +name: "4. PR Title Check" + +on: + pull_request: + types: [opened, reopened, synchronize, edited] + branches: + - main + +permissions: + contents: read + +jobs: + check-pr-title: + name: "Check PR title" + runs-on: ubuntu-latest + steps: + - name: "Check PR title format" + uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@4e781d1d72739015821a380871aa5a66d070177c # 3.1.0 + with: + title: ${{ github.event.pull_request.title }}