Skip to content

Commit c8b303d

Browse files
Merge remote-tracking branch 'origin/main' into AEA-6028
2 parents 434dccc + d79b6ff commit c8b303d

6 files changed

Lines changed: 100 additions & 114 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4545
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4646
quality_checks:
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
4848
needs: [get_asdf_version, get_commit_id]
4949
with:
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -53,7 +53,7 @@ jobs:
5353

5454
tag_release:
5555
needs: [quality_checks, get_commit_id, get_asdf_version]
56-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
56+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@9791a77de7b005056b4ddfb9789306f5179f53da
5757
with:
5858
dry_run: true
5959
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@9791a77de7b005056b4ddfb9789306f5179f53da
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,9 +32,9 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
pr_title_format_check:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@9791a77de7b005056b4ddfb9789306f5179f53da
3636
quality_checks:
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
3838
needs: [get_asdf_version, get_commit_id]
3939
with:
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -109,7 +109,7 @@ jobs:
109109

110110
tag_release:
111111
needs: [get_commit_id, get_asdf_version]
112-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
112+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@9791a77de7b005056b4ddfb9789306f5179f53da
113113
with:
114114
dry_run: true
115115
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4646
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4747
quality_checks:
48-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
4949
needs: [get_asdf_version, get_commit_id]
5050
with:
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -54,7 +54,7 @@ jobs:
5454

5555
tag_release:
5656
needs: [quality_checks, get_commit_id, get_asdf_version]
57-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
57+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@9791a77de7b005056b4ddfb9789306f5179f53da
5858
with:
5959
dry_run: false
6060
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)