Skip to content

Commit 46b6c46

Browse files
Merge pull request #2611 from DFE-Digital/2207-fixes-for-ubuntu-2404-github-actions-runner-2
2207 fixes for ubuntu 2404 GitHub actions runner 2
2 parents 0e67f20 + 3d56b10 commit 46b6c46

File tree

11 files changed

+25
-21
lines changed

11 files changed

+25
-21
lines changed

.github/actions/prepare-app-env/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ runs:
1717
run: sudo apt install -y libvips
1818
shell: bash
1919

20+
- name: Install libmagickwand
21+
run: sudo apt-get install libmagickwand-dev
22+
shell: bash
23+
2024
- name: Set up Ruby
2125
uses: ruby/setup-ruby@v1
2226
with:

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
analyze:
1313
name: Analyze
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515
permissions:
1616
actions: read
1717
contents: read

.github/workflows/configuration-sync.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: workflow_dispatch
55
jobs:
66
export:
77
name: Export (production)
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
99

1010
environment: production
1111

@@ -56,7 +56,7 @@ jobs:
5656

5757
import:
5858
name: Import
59-
runs-on: ubuntu-22.04
59+
runs-on: ubuntu-latest
6060
needs: [export]
6161

6262
strategy:

.github/workflows/database-ptr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
ptr-restore:
3737
name: PTR Restore AKS Database
3838
if: ${{ inputs.environment != 'production' || (inputs.environment == 'production' && github.event.inputs.confirm-production == 'true' ) }}
39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-latest
4040
environment: ${{ inputs.environment }}
4141
concurrency: deploy_${{ inputs.environment }}
4242

.github/workflows/database-restore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
restore:
3636
name: Restore AKS Database
3737
if: ${{ inputs.environment != 'production' || (inputs.environment == 'production' && github.event.inputs.confirm-production == 'true' ) }}
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-latest
3939
environment: ${{ inputs.environment }}
4040
concurrency: deploy_${{ inputs.environment }}
4141

.github/workflows/database.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
backup:
3535
name: Backup database
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-latest
3737
environment:
3838
name: ${{ inputs.environment || 'production' }}
3939
env:
@@ -134,7 +134,7 @@ jobs:
134134
name: Restore preproduction
135135
needs: [backup]
136136
if: ${{ github.event_name == 'schedule' }}
137-
runs-on: ubuntu-22.04
137+
runs-on: ubuntu-latest
138138
environment: production
139139
env:
140140
GLOBAL_CONFIG: preprod

.github/workflows/delete-review-app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Delete Review App ${{ github.event.pull_request.number }}
1111
concurrency: deploy_review_${{ github.event.pull_request.number }}
1212
if: ${{ contains(github.event.pull_request.labels.*.name, 'deploy') }}
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
environment: review
1515
permissions:
1616
id-token: write

.github/workflows/deploy.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
jobs:
3333
docker:
3434
name: Build and push Docker image
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-latest
3636
environment: development
3737

3838
if: contains(github.event.pull_request.labels.*.name, 'deploy') || (github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch')
@@ -66,7 +66,7 @@ jobs:
6666

6767
rspec_system:
6868
name: Rspec System
69-
runs-on: ubuntu-22.04
69+
runs-on: ubuntu-latest
7070
if: github.event_name != 'workflow_dispatch'
7171

7272
services:
@@ -119,7 +119,7 @@ jobs:
119119

120120
rspec_other:
121121
name: Rspec Other
122-
runs-on: ubuntu-22.04
122+
runs-on: ubuntu-latest
123123
if: github.event_name != 'workflow_dispatch'
124124

125125
services:
@@ -174,7 +174,7 @@ jobs:
174174
name: Deploy to review environment
175175
concurrency: deploy_review_${{ github.event.pull_request.number }}
176176
needs: [docker, rspec_system, rspec_other]
177-
runs-on: ubuntu-22.04
177+
runs-on: ubuntu-latest
178178
if: contains(github.event.pull_request.labels.*.name, 'deploy')
179179
environment: review
180180
permissions:
@@ -201,7 +201,7 @@ jobs:
201201
202202
deploy_non_production:
203203
name: Deploy to ${{ matrix.environment }} environment
204-
runs-on: ubuntu-22.04
204+
runs-on: ubuntu-latest
205205
needs: [docker, rspec_system, rspec_other]
206206
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
207207
concurrency: deploy_${{ matrix.environment }}
@@ -231,7 +231,7 @@ jobs:
231231
deploy_production:
232232
name: Deploy to production environment
233233
needs: [docker, rspec_system, rspec_other, deploy_non_production]
234-
runs-on: ubuntu-22.04
234+
runs-on: ubuntu-latest
235235
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
236236
environment:
237237
name: production
@@ -254,7 +254,7 @@ jobs:
254254

255255
notify_slack_of_failures:
256256
name: Notify Slack of failures
257-
runs-on: ubuntu-22.04
257+
runs-on: ubuntu-latest
258258
environment: development
259259

260260
if: ${{ failure() && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
@@ -289,7 +289,7 @@ jobs:
289289

290290
deploy_custom:
291291
name: Custom deployment to ${{ inputs.environment }}
292-
runs-on: ubuntu-22.04
292+
runs-on: ubuntu-latest
293293
if: github.event_name == 'workflow_dispatch'
294294
environment:
295295
name: ${{ inputs.environment }}

.github/workflows/fake-data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
regenerate:
1616
name: Regenerate
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-latest
1818

1919
environment: ${{ github.event.inputs.environment }}
2020

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: pull_request
55
jobs:
66
prettier:
77
name: Prettier
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-latest
99

1010
steps:
1111
- name: Checkout code
@@ -19,7 +19,7 @@ jobs:
1919

2020
rubocop:
2121
name: Rubocop
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-latest
2323

2424
steps:
2525
- name: Checkout code
@@ -33,7 +33,7 @@ jobs:
3333

3434
terraform:
3535
name: Terraform
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-latest
3737

3838
steps:
3939
- name: Checkout code

0 commit comments

Comments
 (0)