Skip to content

Commit d879a80

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/parser-8.48.0
2 parents bdf2fc3 + 12032a5 commit d879a80

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2525
2626
quality_checks:
27-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
27+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
2828
needs: [get_asdf_version]
2929
with:
3030
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -33,7 +33,7 @@ jobs:
3333

3434
tag_release:
3535
needs: [quality_checks, get_asdf_version]
36-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
36+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
3737
with:
3838
dry_run: true
3939
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
@@ -7,7 +7,7 @@ on:
77
jobs:
88
dependabot-auto-approve-and-merge:
99
needs: quality_checks
10-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
10+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@3cba6a3733673bafc95526503478674332c26007
1111
secrets:
1212
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1313
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -30,19 +30,19 @@ jobs:
3030
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3131
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3232
quality_checks:
33-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
33+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
3434
needs: [get_asdf_version]
3535
with:
3636
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3737
secrets:
3838
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3939

4040
pr_title_format_check:
41-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
41+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@3cba6a3733673bafc95526503478674332c26007
4242

4343
tag_release:
4444
needs: [get_asdf_version]
45-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
4646
with:
4747
dry_run: true
4848
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
@@ -25,7 +25,7 @@ jobs:
2525
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2626
2727
quality_checks:
28-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -34,7 +34,7 @@ jobs:
3434

3535
tag_release:
3636
needs: [quality_checks, get_asdf_version]
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
3838
with:
3939
dry_run: false
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)