Skip to content

Commit 73970e5

Browse files
committed
Merge remote-tracking branch 'origin/main' into finish_as_root
2 parents 9a4f04b + b7823e9 commit 73970e5

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/build_all_images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
language_folders: ${{ steps.find-folders.outputs.languages }}
1818
project_folders: ${{ steps.find-folders.outputs.projects }}
1919
steps:
20-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2121

2222
- id: find-folders
2323
run: |

.github/workflows/build_multi_arch_image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
username: ${{github.actor}}
5454
password: ${{secrets.GITHUB_TOKEN}}
5555
- name: Checkout code
56-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
56+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
5757
with:
5858
fetch-depth: 0
5959
- name: setup node
@@ -88,7 +88,7 @@ jobs:
8888
IMAGE_TAG: ":${{ inputs.docker_tag }}-${{ matrix.arch }}"
8989
BASE_FOLDER: "${{ inputs.base_folder }}"
9090
- name: Check docker vulnerabilities - json output
91-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
91+
uses: aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284
9292
with:
9393
scan-type: "image"
9494
image-ref: "ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}:${{ inputs.docker_tag }}-${{ matrix.arch }}"
@@ -105,7 +105,7 @@ jobs:
105105
name: "scan_results_docker_${{ inputs.container_name }}_${{ matrix.arch }}.json"
106106
path: scan_results_docker.json
107107
- name: Check docker vulnerabilities - table output
108-
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8
108+
uses: aquasecurity/trivy-action@c1824fd6edce30d7ab345a9989de00bbd46ef284
109109
with:
110110
scan-type: "image"
111111
image-ref: "ghcr.io/nhsdigital/eps-devcontainers/${{ inputs.container_name }}:${{ inputs.docker_tag }}-${{ matrix.arch }}"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
tag_format: '${{ steps.load-config.outputs.TAG_FORMAT }}'
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
1515
- name: Get asdf version
1616
id: asdf-version
1717
run: >-

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
tag_format: '${{ steps.load-config.outputs.TAG_FORMAT }}'
2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2424
- name: Get asdf version
2525
id: asdf-version
2626
run: >-
@@ -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@5ccebbf821beef2de6abdce9e392b3cbeb4999e3
44+
NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@997a1946c83bb2a9eda418847ed640738af949ff
4545
get_issue_number:
4646
runs-on: ubuntu-22.04
4747
needs: quality_checks
@@ -75,7 +75,7 @@ jobs:
7575
sha_short: '${{ steps.commit_id.outputs.sha_short }}'
7676
steps:
7777
- name: Checkout code
78-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
78+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
7979
with:
8080
ref: '${{ env.BRANCH_NAME }}'
8181
- name: Get Commit ID

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
tag_format: '${{ steps.load-config.outputs.TAG_FORMAT }}'
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
1616
- name: Get asdf version
1717
id: asdf-version
1818
run: >-

0 commit comments

Comments
 (0)