Skip to content

Commit 05a223c

Browse files
jameslinnelljameslinnell
authored
Merge pull request #626 from NHSDigital/release/2025-12-17
Release/2025-12-17
2 parents 045def2 + 0d0116b commit 05a223c

File tree

12 files changed

+66
-52
lines changed

12 files changed

+66
-52
lines changed

‎.github/workflows/_deploy.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: [self-hosted, ci]
5353
needs: get-branch-from-workflow-file
5454
steps:
55-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v6
5656
with:
5757
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
5858
- if: ${{ env.SCOPE == 'per_workspace'}}
@@ -81,7 +81,7 @@ jobs:
8181
needs: [get-branch-from-workflow-file, build]
8282
runs-on: [self-hosted, ci]
8383
steps:
84-
- uses: actions/checkout@v4
84+
- uses: actions/checkout@v6
8585
with:
8686
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
8787
- uses: ./.github/actions/terraform/
@@ -98,7 +98,7 @@ jobs:
9898
needs: [get-branch-from-workflow-file, terraform--init]
9999
runs-on: [self-hosted, ci]
100100
steps:
101-
- uses: actions/checkout@v4
101+
- uses: actions/checkout@v6
102102
with:
103103
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
104104
- uses: ./.github/actions/terraform/
@@ -116,7 +116,7 @@ jobs:
116116
environment: ${{ inputs.account }}
117117
runs-on: [self-hosted, ci]
118118
steps:
119-
- uses: actions/checkout@v4
119+
- uses: actions/checkout@v6
120120
with:
121121
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
122122
- uses: ./.github/actions/terraform/
@@ -133,7 +133,7 @@ jobs:
133133
needs: [get-branch-from-workflow-file, terraform--apply]
134134
runs-on: [self-hosted, ci]
135135
steps:
136-
- uses: actions/checkout@v4
136+
- uses: actions/checkout@v6
137137
with:
138138
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
139139
- uses: ./.github/actions/make/
@@ -144,7 +144,7 @@ jobs:
144144
restore-from-cache: "true"
145145
cache-suffix: ${{ env.CACHE_NAME }}
146146
- name: Archive swagger
147-
uses: actions/upload-artifact@v4
147+
uses: actions/upload-artifact@v6
148148
with:
149149
name: swagger
150150
path: |
@@ -157,7 +157,7 @@ jobs:
157157
needs: [get-branch-from-workflow-file, apigee--deploy]
158158
runs-on: [self-hosted, ci]
159159
steps:
160-
- uses: actions/checkout@v4
160+
- uses: actions/checkout@v6
161161
with:
162162
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
163163
- if: ${{ env.SCOPE == 'per_workspace' && (env.ACCOUNT == 'int' || env.ACCOUNT == 'prod') }}
@@ -172,7 +172,7 @@ jobs:
172172
needs: [get-branch-from-workflow-file, apigee--deploy]
173173
runs-on: [self-hosted, ci]
174174
steps:
175-
- uses: actions/checkout@v4
175+
- uses: actions/checkout@v6
176176
with:
177177
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
178178
- if: ${{ env.ACCOUNT != 'mgmt' && env.ACCOUNT != 'backups' }}

‎.github/workflows/_deploy_backups.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: [self-hosted, ci]
5252
needs: get-branch-from-workflow-file
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v6
5555
with:
5656
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
5757
- if: ${{ env.SCOPE == 'per_workspace'}}
@@ -73,7 +73,7 @@ jobs:
7373
needs: [get-branch-from-workflow-file, build]
7474
runs-on: [self-hosted, ci]
7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v6
7777
with:
7878
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
7979
- uses: ./.github/actions/terraform/
@@ -90,7 +90,7 @@ jobs:
9090
needs: [get-branch-from-workflow-file, terraform--init]
9191
runs-on: [self-hosted, ci]
9292
steps:
93-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v6
9494
with:
9595
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
9696
- uses: ./.github/actions/terraform/
@@ -108,7 +108,7 @@ jobs:
108108
environment: ${{ inputs.account }}
109109
runs-on: [self-hosted, ci]
110110
steps:
111-
- uses: actions/checkout@v4
111+
- uses: actions/checkout@v6
112112
with:
113113
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
114114
- uses: ./.github/actions/terraform/

‎.github/workflows/destroy-expired-workspaces.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: [self-hosted, ci]
2929
needs: [parse-secrets]
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v6
3232
with:
3333
ref: ${{ env.BRANCH_NAME }}
3434
- uses: ./.github/actions/make/
@@ -42,7 +42,7 @@ jobs:
4242
needs: [build-base]
4343
steps:
4444
- name: Checkout code
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v6
4646
with:
4747
ref: ${{ env.BRANCH_NAME }}
4848

‎.github/workflows/destroy-nonprod-workspace.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: [self-hosted, ci]
4242
needs: [get-branch-from-workflow-file]
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v6
4545
with:
4646
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
4747
- uses: ./.github/actions/make/
@@ -55,7 +55,7 @@ jobs:
5555
needs: [build-base]
5656
steps:
5757
- name: Checkout code
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
5959
with:
6060
ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
6161
- name: Destroy workspace

‎.github/workflows/merge.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Create a tag from main
1818
steps:
1919
- name: Checkout the repo
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121
- name: Create 'env.tag' from the latest release
2222
run: |
2323
TAG=$(make changelog--get-latest-release)
@@ -51,7 +51,7 @@ jobs:
5151
runs-on: [self-hosted, ci]
5252
needs: [create-coverage-name, make-tag]
5353
steps:
54-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@v6
5555
with:
5656
ref: main
5757
- name: Download artifact
@@ -62,7 +62,7 @@ jobs:
6262
workflow: pull-requests.yml
6363
workflow_conclusion: success
6464
- name: SonarQube Scan
65-
uses: SonarSource/sonarqube-scan-action@v5
65+
uses: SonarSource/sonarqube-scan-action@v7
6666
env:
6767
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6868
SONAR_HOST_URL: https://sonarcloud.io

‎.github/workflows/on-pr-close.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
steps:
2929
- name: Checkout Branch
3030
id: checkout-build-branch
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232
continue-on-error: true
3333
with:
3434
ref: ${{ env.BRANCH_NAME }}
3535
- name: Fallback to main
3636
if: steps.checkout-build-branch.outcome == 'failure'
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838
with:
3939
ref: main
4040
- uses: ./.github/actions/make/
@@ -49,13 +49,13 @@ jobs:
4949
steps:
5050
- name: Checkout Branch for destroy
5151
id: checkout-destroy-branch
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
continue-on-error: true
5454
with:
5555
ref: ${{ env.BRANCH_NAME }}
5656
- name: Fallback to main for destroy
5757
if: steps.checkout-destroy-branch.outcome == 'failure'
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
5959
with:
6060
ref: main
6161
fetch-depth: 0

‎.github/workflows/pull-requests.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
workflow--check--branch-name:
2121
runs-on: [self-hosted, ci]
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
with:
2525
ref: ${{ env.BRANCH_NAME }}
2626
- uses: ./.github/actions/make/
@@ -30,7 +30,7 @@ jobs:
3030
workflow--check--rebased-on-main:
3131
runs-on: [self-hosted, ci]
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
with:
3535
fetch-depth: 0
3636
- uses: ./.github/actions/make/
@@ -40,7 +40,7 @@ jobs:
4040
workflow--check--release-branch-name:
4141
runs-on: [self-hosted, ci]
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v6
4444
with:
4545
ref: ${{ github.event.pull_request.head.ref }}
4646
- uses: ./.github/actions/make/
@@ -76,7 +76,7 @@ jobs:
7676
runs-on: [self-hosted, ci]
7777
needs: [parse-secrets]
7878
steps:
79-
- uses: actions/checkout@v4
79+
- uses: actions/checkout@v6
8080
with:
8181
ref: ${{ env.BRANCH_NAME }}
8282
- uses: ./.github/actions/make/
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: [self-hosted, ci]
9090
needs: [workflow--check--branch-name]
9191
steps:
92-
- uses: actions/checkout@v4
92+
- uses: actions/checkout@v6
9393
with:
9494
ref: ${{ env.BASE_BRANCH_NAME }}
9595
- uses: ./.github/actions/make/
@@ -103,7 +103,7 @@ jobs:
103103
runs-on: [self-hosted, ci]
104104
needs: [build-head]
105105
steps:
106-
- uses: actions/checkout@v4
106+
- uses: actions/checkout@v6
107107
with:
108108
ref: ${{ env.BRANCH_NAME }}
109109
- uses: ./.github/actions/make/
@@ -117,7 +117,7 @@ jobs:
117117
matrix:
118118
test-type: [unit, slow]
119119
steps:
120-
- uses: actions/checkout@v4
120+
- uses: actions/checkout@v6
121121
with:
122122
ref: ${{ env.BRANCH_NAME }}
123123
- uses: ./.github/actions/pytest-with-rerun/
@@ -128,7 +128,7 @@ jobs:
128128
needs: [build-head]
129129
runs-on: [self-hosted, ci]
130130
steps:
131-
- uses: actions/checkout@v4
131+
- uses: actions/checkout@v6
132132
with:
133133
ref: ${{ env.BRANCH_NAME }}
134134
- uses: ./.github/actions/make/
@@ -139,7 +139,7 @@ jobs:
139139
needs: [create-workspace-name, build-base, parse-secrets]
140140
runs-on: [self-hosted, ci]
141141
steps:
142-
- uses: actions/checkout@v4
142+
- uses: actions/checkout@v6
143143
with:
144144
ref: ${{ env.BASE_BRANCH_NAME }}
145145
- uses: ./.github/actions/terraform/
@@ -168,7 +168,7 @@ jobs:
168168
]
169169
runs-on: [self-hosted, ci]
170170
steps:
171-
- uses: actions/checkout@v4
171+
- uses: actions/checkout@v6
172172
with:
173173
ref: ${{ env.BRANCH_NAME }}
174174
- uses: ./.github/actions/terraform/
@@ -186,7 +186,7 @@ jobs:
186186
needs: [build-head, terraform-head-build]
187187
runs-on: [self-hosted, ci]
188188
steps:
189-
- uses: actions/checkout@v4
189+
- uses: actions/checkout@v6
190190
with:
191191
ref: ${{ env.BRANCH_NAME }}
192192
- uses: ./.github/actions/make/
@@ -200,7 +200,7 @@ jobs:
200200
needs: [build-head, apigee--deploy]
201201
runs-on: [self-hosted, ci]
202202
steps:
203-
- uses: actions/checkout@v4
203+
- uses: actions/checkout@v6
204204
with:
205205
ref: ${{ env.BRANCH_NAME }}
206206
- run: |
@@ -227,7 +227,7 @@ jobs:
227227
matrix:
228228
test-type: [integration]
229229
steps:
230-
- uses: actions/checkout@v4
230+
- uses: actions/checkout@v6
231231
with:
232232
ref: ${{ env.BRANCH_NAME }}
233233
- uses: ./.github/actions/pytest-with-rerun/
@@ -247,7 +247,7 @@ jobs:
247247
]
248248
runs-on: [self-hosted, ci]
249249
steps:
250-
- uses: actions/checkout@v4
250+
- uses: actions/checkout@v6
251251
with:
252252
ref: ${{ env.BRANCH_NAME }}
253253
- uses: ./.github/actions/make/
@@ -270,7 +270,7 @@ jobs:
270270
]
271271
runs-on: [self-hosted, ci]
272272
steps:
273-
- uses: actions/checkout@v4
273+
- uses: actions/checkout@v6
274274
with:
275275
ref: ${{ env.BRANCH_NAME }}
276276
- uses: ./.github/actions/make/
@@ -305,7 +305,7 @@ jobs:
305305
]
306306
runs-on: [self-hosted, ci]
307307
steps:
308-
- uses: actions/checkout@v4
308+
- uses: actions/checkout@v6
309309
with:
310310
ref: ${{ env.BRANCH_NAME }}
311311
- uses: ./.github/actions/make/
@@ -314,12 +314,12 @@ jobs:
314314
requires-aws: true
315315
save-to-cache: "true"
316316
- name: Upload artifact
317-
uses: actions/upload-artifact@v4
317+
uses: actions/upload-artifact@v6
318318
with:
319319
name: "${{ needs.create-coverage-name.outputs.coverage-name }}-coverage"
320320
path: "sonarcloud-coverage.xml"
321321
- name: SonarQube Scan
322-
uses: SonarSource/sonarqube-scan-action@v5
322+
uses: SonarSource/sonarqube-scan-action@v7
323323
env:
324324
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
325325
SONAR_HOST_URL: https://sonarcloud.io
@@ -335,7 +335,7 @@ jobs:
335335
runs-on: [self-hosted, ci]
336336
if: ${{ needs.apigee--attach-product.result == 'success' }}
337337
steps:
338-
- uses: actions/checkout@v4
338+
- uses: actions/checkout@v6
339339
with:
340340
ref: ${{ env.BRANCH_NAME }}
341341
- run: |
@@ -352,7 +352,7 @@ jobs:
352352
runs-on: [self-hosted, ci]
353353
if: ${{ needs.apigee--deploy.result == 'success' }}
354354
steps:
355-
- uses: actions/checkout@v4
355+
- uses: actions/checkout@v6
356356
with:
357357
ref: ${{ env.BRANCH_NAME }}
358358
- uses: ./.github/actions/make/
@@ -366,7 +366,7 @@ jobs:
366366
runs-on: [self-hosted, ci]
367367
needs: [build-head]
368368
steps:
369-
- uses: actions/checkout@v4
369+
- uses: actions/checkout@v6
370370
with:
371371
ref: ${{ env.BRANCH_NAME }}
372372
fetch-depth: 0

0 commit comments

Comments
 (0)