Skip to content

Commit 29ed377

Browse files
Build: [AEA-6028] - Updated to merged version of common workflows (#444)
## Summary - Routine Change
1 parent 3d51b4b commit 29ed377

3 files changed

Lines changed: 11 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 4 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@9791a77de7b005056b4ddfb9789306f5179f53da
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
4848
needs: [get_asdf_version, get_commit_id]
4949
with:
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -53,13 +53,12 @@ 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@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
56+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
5757
with:
5858
dry_run: true
5959
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
6060
branch_name: main
61-
publish_package: false
62-
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
61+
publish_packages: packages/cdkConstructs,packages/deploymentUtils
6362
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
6463
secrets: inherit
6564

.github/workflows/pull_request.yml

Lines changed: 5 additions & 6 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@9791a77de7b005056b4ddfb9789306f5179f53da
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
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@9791a77de7b005056b4ddfb9789306f5179f53da
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
3636
quality_checks:
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
3838
needs: [get_asdf_version, get_commit_id]
3939
with:
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -109,12 +109,11 @@ jobs:
109109

110110
tag_release:
111111
needs: [get_commit_id, get_asdf_version]
112-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
112+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
113113
with:
114114
dry_run: true
115115
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
116116
branch_name: ${{ github.event.pull_request.head.ref }}
117-
publish_package: false
118-
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
117+
publish_packages: packages/cdkConstructs,packages/deploymentUtils
119118
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
120119
secrets: inherit

.github/workflows/release.yml

Lines changed: 3 additions & 4 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@9791a77de7b005056b4ddfb9789306f5179f53da
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
4949
needs: [get_asdf_version, get_commit_id]
5050
with:
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -54,13 +54,12 @@ 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@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
57+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
5858
with:
5959
dry_run: false
6060
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
6161
branch_name: main
62-
publish_package: false
63-
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
62+
publish_packages: packages/cdkConstructs,packages/deploymentUtils
6463
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
6564
secrets: inherit
6665

0 commit comments

Comments
 (0)