Skip to content

Commit

Permalink
Merge pull request #298 from boesing/qa/synchronize-package-json-with…
Browse files Browse the repository at this point in the history
…-dockerfile

Synchronize `package.json` and `package-lock.json` with `Dockerfile` version of `node`
  • Loading branch information
boesing authored Apr 24, 2024
2 parents 7b1bb2a + ed19123 commit f25365c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 20
node-version: 21
- name: "Install node modules"
run: "npm ci"
- name: Run ESLint
Expand All @@ -149,8 +149,19 @@ jobs:
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 20
node-version: 21
- name: "Install node modules"
run: "npm ci"
- name: Run Jest
run: "npm run test"

package-lock-up-to-date:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v4"
- uses: "actions/setup-node@v4"
with:
check-latest: true
node-version: 21
- name: "Check package-lock.json is up2date"
run: "npx --yes package-lock-utd"
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ COPY package*.json ./
COPY tsconfig.json ./
COPY webpack.config.ts ./
RUN npm ci
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)
COPY ./src ./src
RUN npm run build

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"engines": {
"npm": "^10.0.0",
"node": "^20.2.0"
"node": "^21.7.0"
},
"dependencies": {
"@actions/core": "^1.10.0",
Expand Down

0 comments on commit f25365c

Please sign in to comment.