Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
needs: [get_asdf_version, get_commit_id]
with:
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
Expand All @@ -53,13 +53,12 @@ jobs:

tag_release:
needs: [quality_checks, get_commit_id, get_asdf_version]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
with:
dry_run: true
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
branch_name: main
publish_package: false
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
publish_packages: packages/cdkConstructs,packages/deploymentUtils
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
secrets: inherit

Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
dependabot-auto-approve-and-merge:
needs: quality_checks
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@9791a77de7b005056b4ddfb9789306f5179f53da
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
secrets:
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
Expand All @@ -32,9 +32,9 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
pr_title_format_check:
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@9791a77de7b005056b4ddfb9789306f5179f53da
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
needs: [get_asdf_version, get_commit_id]
with:
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
Expand Down Expand Up @@ -109,12 +109,11 @@ jobs:

tag_release:
needs: [get_commit_id, get_asdf_version]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
with:
dry_run: true
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
branch_name: ${{ github.event.pull_request.head.ref }}
publish_package: false
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
publish_packages: packages/cdkConstructs,packages/deploymentUtils
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
secrets: inherit
7 changes: 3 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@9791a77de7b005056b4ddfb9789306f5179f53da
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
needs: [get_asdf_version, get_commit_id]
with:
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
Expand All @@ -54,13 +54,12 @@ jobs:

tag_release:
needs: [quality_checks, get_commit_id, get_asdf_version]
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@cebdda4ff41dccf3d3422ef9dd8c944dfdbcab1f
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b796becae6fece7d8d093e0aa976a05d3a5e5dbe
with:
dry_run: false
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
branch_name: main
publish_package: false
publish_subpackages: packages/cdkConstructs,packages/deploymentUtils
publish_packages: packages/cdkConstructs,packages/deploymentUtils
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
secrets: inherit

Expand Down