Skip to content

Commit cc59c03

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/devcontainers/cli-0.83.2
2 parents 3dbc0c8 + cd7c2c3 commit cc59c03

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/build_multi_arch_image.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
CONTAINER_NAME: '${{ inputs.container_name }}'
150150
ARCHITECTURE: '${{ matrix.arch }}'
151151
- name: Attest image
152-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
152+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
153153
with:
154154
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
155155
subject-digest: ${{ steps.resolve_arch_digest.outputs.digest }}
@@ -173,7 +173,7 @@ jobs:
173173
CONTAINER_NAME: '${{ inputs.container_name }}'
174174
ARCHITECTURE: '${{ matrix.arch }}'
175175
- name: Attest github actions image
176-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
176+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
177177
with:
178178
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
179179
subject-digest: ${{ steps.resolve_githubactions_arch_digest.outputs.digest }}
@@ -214,7 +214,7 @@ jobs:
214214
ARCHITECTURE: '${{ matrix.arch }}'
215215
- name: Attest github actions latest image
216216
if: ${{ inputs.tag_latest }}
217-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
217+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
218218
with:
219219
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
220220
subject-digest: ${{ steps.resolve_githubactions_latest_arch_digest.outputs.digest }}
@@ -239,7 +239,7 @@ jobs:
239239
ARCHITECTURE: '${{ matrix.arch }}'
240240
- name: Attest latest image
241241
if: ${{ inputs.tag_latest }}
242-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
242+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
243243
with:
244244
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
245245
subject-digest: ${{ steps.resolve_latest_arch_digest.outputs.digest }}
@@ -334,7 +334,7 @@ jobs:
334334
CONTAINER_NAME: '${{ inputs.container_name }}'
335335

336336
- name: Attest combined image
337-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
337+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
338338
with:
339339
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
340340
subject-digest: ${{ steps.resolve_combined_digest.outputs.digest }}
@@ -358,7 +358,7 @@ jobs:
358358
CONTAINER_NAME: '${{ inputs.container_name }}'
359359

360360
- name: Attest combined github actions image
361-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
361+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
362362
with:
363363
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
364364
subject-digest: ${{ steps.resolve_githubactions_combined_digest.outputs.digest }}
@@ -383,7 +383,7 @@ jobs:
383383

384384
- name: Attest latest github actions image
385385
if: ${{ inputs.tag_latest }}
386-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
386+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
387387
with:
388388
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
389389
subject-digest: ${{ steps.resolve_githubactions_latest_digest.outputs.digest }}
@@ -408,7 +408,7 @@ jobs:
408408

409409
- name: Attest latest image
410410
if: ${{ inputs.tag_latest }}
411-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a
411+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f
412412
with:
413413
subject-name: ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}
414414
subject-digest: ${{ steps.resolve_latest_digest.outputs.digest }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2424
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2525
quality_checks:
26-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
26+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
2727
needs:
2828
- get_asdf_version
2929
with:
@@ -32,7 +32,7 @@ jobs:
3232
SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
3333
tag_release:
3434
needs: [quality_checks, get_asdf_version]
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@997a1946c83bb2a9eda418847ed640738af949ff
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
3636
with:
3737
dry_run: true
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
dependabot-auto-approve-and-merge:
1010
needs: quality_checks
1111
uses: >-
12-
NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@997a1946c83bb2a9eda418847ed640738af949ff
12+
NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
1313
secrets:
1414
AUTOMERGE_APP_ID: '${{ secrets.AUTOMERGE_APP_ID }}'
1515
AUTOMERGE_PEM: '${{ secrets.AUTOMERGE_PEM }}'
@@ -32,7 +32,7 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
3636
needs:
3737
- get_asdf_version
3838
with:
@@ -41,7 +41,7 @@ jobs:
4141
SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
4242
pr_title_format_check:
4343
uses: >-
44-
NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@997a1946c83bb2a9eda418847ed640738af949ff
44+
NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
4545
get_issue_number:
4646
runs-on: ubuntu-22.04
4747
needs: quality_checks

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2525
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2626
quality_checks:
27-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@997a1946c83bb2a9eda418847ed640738af949ff
27+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
2828
needs:
2929
- get_asdf_version
3030
with:
@@ -33,7 +33,7 @@ jobs:
3333
SONAR_TOKEN: '${{ secrets.SONAR_TOKEN }}'
3434
tag_release:
3535
needs: [quality_checks, get_asdf_version]
36-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@997a1946c83bb2a9eda418847ed640738af949ff
36+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
3737
with:
3838
dry_run: false
3939
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)