From 4428c6080c663b2fb2acac68320f7daf5115a010 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Mon, 30 Mar 2026 15:53:08 +0000 Subject: [PATCH 1/3] fix name --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15ae899..1a7bab4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: pull_request +name: ci on: push: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6c372c6..6543512 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,9 @@ -name: pull_request +name: release on: - workflow_dispatch: - schedule: - - cron: "0 8 * * 3" + workflow_dispatch: + schedule: + - cron: "0 8 * * 3" env: BRANCH_NAME: ${{ github.event.pull_request.head.ref }} From 2361cf995d3d237032cccc9ab3e4f8ad7d883636 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Mon, 30 Mar 2026 15:59:12 +0000 Subject: [PATCH 2/3] fix it --- .github/workflows/ci.yml | 3 --- .github/workflows/pull_request.yml | 3 --- .github/workflows/release.yml | 5 +---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1a7bab4..8f2cf79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,6 @@ on: push: branches: [main] -env: - BRANCH_NAME: ${{ github.event.pull_request.head.ref }} - jobs: get_config_values: uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 758079c..b08711a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4,9 +4,6 @@ on: pull_request: branches: [main] -env: - BRANCH_NAME: ${{ github.event.pull_request.head.ref }} - jobs: get_config_values: uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6543512..7a61924 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,9 +5,6 @@ on: schedule: - cron: "0 8 * * 3" -env: - BRANCH_NAME: ${{ github.event.pull_request.head.ref }} - jobs: get_config_values: uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 @@ -40,6 +37,6 @@ jobs: with: dry_run: false pinned_image: ${{ needs.get_config_values.outputs.pinned_image }} - branch_name: ${{ github.event.pull_request.head.ref }} + branch_name: main tag_format: ${{ needs.get_config_values.outputs.tag_format }} secrets: inherit From bda07d7c4ec0aef0edde8ee5b5fd448d0f5b4fa7 Mon Sep 17 00:00:00 2001 From: Anthony Brown Date: Mon, 30 Mar 2026 16:00:05 +0000 Subject: [PATCH 3/3] really fix it --- .github/workflows/ci.yml | 9 --------- .github/workflows/release.yml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f2cf79..9ab4aa9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,6 @@ jobs: with: verify_published_from_main_image: false - dependabot-auto-approve-and-merge: - uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 - secrets: - AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }} - AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }} - quality_checks: uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 needs: [get_config_values] @@ -24,9 +18,6 @@ jobs: secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - pr_title_format_check: - uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 - tag_release: needs: [get_config_values] uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a61924..335d4b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,12 +11,6 @@ jobs: with: verify_published_from_main_image: false - dependabot-auto-approve-and-merge: - uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 - secrets: - AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }} - AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }} - quality_checks: uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 needs: [get_config_values] @@ -25,9 +19,6 @@ jobs: secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - pr_title_format_check: - uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7 - tag_release: needs: [get_config_values] uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@f3d19a678a725917a5c59cae4d76db621bb7c9c7