Skip to content

Commit

Permalink
Merge pull request #582 from DEFRA/node-22
Browse files Browse the repository at this point in the history
Switch to Node.js 22 + Ubuntu 24.04
  • Loading branch information
colinrotherham authored Nov 14, 2024
2 parents da0e06d + c562720 commit f92cf56
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[node]
node 20
node 22
24 changes: 7 additions & 17 deletions .github/workflows/check-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ concurrency:
jobs:
build:
name: Build
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-24.04

strategy:
fail-fast: false

matrix:
runner:
- ubuntu-latest

steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down Expand Up @@ -64,8 +60,8 @@ jobs:
run: npm run build

lint:
name: ${{ matrix.task.description }} (${{ matrix.runner }})
runs-on: ${{ matrix.runner }}
name: ${{ matrix.task.description }}
runs-on: ubuntu-24.04
needs: [build]

env:
Expand All @@ -77,9 +73,6 @@ jobs:
fail-fast: false

matrix:
runner:
- ubuntu-latest

task:
- description: Prettier
name: lint-prettier
Expand Down Expand Up @@ -148,17 +141,14 @@ jobs:
run: ${{ matrix.task.run }}

tasks:
name: ${{ matrix.task.description }} (${{ matrix.runner }})
runs-on: ${{ matrix.runner }}
name: ${{ matrix.task.description }}
runs-on: ubuntu-24.04
needs: [build]

strategy:
fail-fast: false

matrix:
runner:
- ubuntu-latest

task:
- description: Unit tests
name: test-unit
Expand Down Expand Up @@ -211,14 +201,14 @@ jobs:
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.task.description }} coverage (${{ matrix.runner }})
name: ${{ matrix.task.description }} coverage
path: coverage
if-no-files-found: ignore

analysis:
name: Analysis
if: ${{ always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build, tasks]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-notifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ env:
jobs:
notify:
name: Slack notify
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ !contains(github.event.pull_request.head.ref || github.head_ref || github.ref, 'dependabot/') }}

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-model.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:
jobs:
build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Check out code
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

publish:
name: Publish
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build]
environment: production

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
build:
if: github.run_number != 1
name: CDP-build-workflow
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/iron
lts/jod
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PARENT_VERSION=2.2.2-node20.11.1
ARG PARENT_VERSION=latest-22
ARG PORT=3000
ARG PORT_DEBUG=9229

Expand Down
2 changes: 1 addition & 1 deletion designer/.browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ iOS >= 11
ie 11

[node]
node 20
node 22
4 changes: 2 additions & 2 deletions designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"webpack-cli": "^5.1.4"
},
"engines": {
"node": "^20.9.0",
"npm": "^10.1.0"
"node": "^22.11.0",
"npm": "^10.9.0"
}
}
2 changes: 1 addition & 1 deletion model/.browserslistrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[node]
node 20
node 22
4 changes: 2 additions & 2 deletions model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"joi": "^17.0.0"
},
"engines": {
"node": "^20.9.0",
"npm": "^10.1.0"
"node": "^22.11.0",
"npm": "^10.9.0"
}
}
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"typescript": "^5.6.3"
},
"engines": {
"node": "^20.9.0",
"npm": "^10.1.0"
"node": "^22.11.0",
"npm": "^10.9.0"
}
}

0 comments on commit f92cf56

Please sign in to comment.