Skip to content

Commit 5e61d2e

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/aws-sdk/client-cloudformation-3.989.0
2 parents 9e9d570 + 1ab0eda commit 5e61d2e

3 files changed

Lines changed: 8 additions & 8 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@ae3d6b307b3174b5724a31f63776ce4159639d20
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
4848
needs: [get_asdf_version, get_commit_id]
4949
with:
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
tag_release:
5757
needs: [quality_checks, get_commit_id, get_asdf_version]
58-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@5ccebbf821beef2de6abdce9e392b3cbeb4999e3
58+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@997a1946c83bb2a9eda418847ed640738af949ff
5959
with:
6060
dry_run: true
6161
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@ae3d6b307b3174b5724a31f63776ce4159639d20
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@997a1946c83bb2a9eda418847ed640738af949ff
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@ae3d6b307b3174b5724a31f63776ce4159639d20
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@997a1946c83bb2a9eda418847ed640738af949ff
3636
quality_checks:
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@ae3d6b307b3174b5724a31f63776ce4159639d20
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
3838
needs: [get_asdf_version, get_commit_id]
3939
with:
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -112,7 +112,7 @@ jobs:
112112

113113
tag_release:
114114
needs: [get_commit_id, get_asdf_version]
115-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@5ccebbf821beef2de6abdce9e392b3cbeb4999e3
115+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@997a1946c83bb2a9eda418847ed640738af949ff
116116
with:
117117
dry_run: true
118118
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@ae3d6b307b3174b5724a31f63776ce4159639d20
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
4949
needs: [get_asdf_version, get_commit_id]
5050
with:
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -56,7 +56,7 @@ jobs:
5656

5757
tag_release:
5858
needs: [quality_checks, get_commit_id, get_asdf_version]
59-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@5ccebbf821beef2de6abdce9e392b3cbeb4999e3
59+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@997a1946c83bb2a9eda418847ed640738af949ff
6060
with:
6161
dry_run: false
6262
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)