Skip to content

Commit f25365c

Browse files
authored
Merge pull request #298 from boesing/qa/synchronize-package-json-with-dockerfile
Synchronize `package.json` and `package-lock.json` with `Dockerfile` version of `node`
2 parents 7b1bb2a + ed19123 commit f25365c

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
- uses: "actions/setup-node@v4"
137137
with:
138138
check-latest: true
139-
node-version: 20
139+
node-version: 21
140140
- name: "Install node modules"
141141
run: "npm ci"
142142
- name: Run ESLint
@@ -149,8 +149,19 @@ jobs:
149149
- uses: "actions/setup-node@v4"
150150
with:
151151
check-latest: true
152-
node-version: 20
152+
node-version: 21
153153
- name: "Install node modules"
154154
run: "npm ci"
155155
- name: Run Jest
156156
run: "npm run test"
157+
158+
package-lock-up-to-date:
159+
runs-on: "ubuntu-latest"
160+
steps:
161+
- uses: "actions/checkout@v4"
162+
- uses: "actions/setup-node@v4"
163+
with:
164+
check-latest: true
165+
node-version: 21
166+
- name: "Check package-lock.json is up2date"
167+
run: "npx --yes package-lock-utd"

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ COPY package*.json ./
66
COPY tsconfig.json ./
77
COPY webpack.config.ts ./
88
RUN npm ci
9+
RUN apk add --no-cache jq && npx semver -r $(jq -r '.engines.node' package.json) $(node -v) || (echo "ERROR: Container node version is not allowed by projects package.json engine range." && exit 1)
910
COPY ./src ./src
1011
RUN npm run build
1112

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"engines": {
1111
"npm": "^10.0.0",
12-
"node": "^20.2.0"
12+
"node": "^21.7.0"
1313
},
1414
"dependencies": {
1515
"@actions/core": "^1.10.0",

0 commit comments

Comments
 (0)