Skip to content

Commit

Permalink
Use node 22, now in maintenance LTS (#1337)
Browse files Browse the repository at this point in the history
  • Loading branch information
lognaturel authored Dec 10, 2024
1 parent e99419a commit 4355d9e
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
jobs:
build:
docker:
- image: cimg/node:20.17.0
- image: cimg/node:22.12.0
- image: cimg/postgres:14.10
environment:
POSTGRES_PASSWORD: odktest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/oidc-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22.12.0
cache: 'npm'
- run: make test-oidc-e2e
- name: Archive playwright screenshots
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/oidc-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22.12.0
cache: 'npm'
- run: npm ci
- run: FAKE_OIDC_ROOT_URL=http://localhost:9898 make fake-oidc-server-ci > fake-oidc-server.log &
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/s3-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22.12.0
cache: 'npm'
- run: npm ci
- run: node lib/bin/create-docker-databases.js
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/soak-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22.12.0
cache: 'npm'
- run: npm ci
- run: node lib/bin/create-docker-databases.js
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/standard-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version: 22.12.0
cache: 'npm'
- run: npm ci
- run: node lib/bin/create-docker-databases.js
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/standard-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
--health-retries 5
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20
- name: Set node version
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22.12.0
cache: 'npm'
- run: npm ci
- run: node lib/bin/create-docker-databases.js
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,27 +101,27 @@ debug: base

.PHONY: test
test: lint
BCRYPT=insecure npx mocha --recursive
BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive

.PHONY: test-ci
test-ci: lint
BCRYPT=insecure npx mocha --recursive --reporter test/ci-mocha-reporter.js
BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive --reporter test/ci-mocha-reporter.js

.PHONY: test-fast
test-fast: node_version
BCRYPT=insecure npx mocha --recursive --fgrep @slow --invert
BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive --fgrep @slow --invert

.PHONY: test-integration
test-integration: node_version
BCRYPT=insecure npx mocha --recursive test/integration
BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive test/integration

.PHONY: test-unit
test-unit: node_version
BCRYPT=insecure npx mocha --recursive test/unit

.PHONY: test-coverage
test-coverage: node_version
npx nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test
npx --node-options="--no-deprecation" nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test

.PHONY: lint
lint: node_version
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.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.1.0",
"private": true,
"engines": {
"node": "20"
"node": "22"
},
"volta": {
"node": "20.17.0"
"node": "22.12.0"
},
"dependencies": {
"@sentry/node": "~7",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/oidc/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ if [[ ${INSTALL_PLAYWRIGHT_DEPS-} = true ]]; then
npx playwright install --with-deps
fi
log "Running playwright tests..."
npx playwright test
npx --node-options="--no-deprecation" playwright test

log "Tests completed OK!"
2 changes: 1 addition & 1 deletion test/e2e/s3/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ timeout 30 bash -c "while ! curl -s -o /dev/null $serverUrl; do sleep 1; done"
log 'Backend started!'

cd test/e2e/s3
npx mocha test.js
npx --node-options="--no-deprecation" mocha test.js

if ! curl -s -o /dev/null "$serverUrl"; then
log '!!! Backend died.'
Expand Down

0 comments on commit 4355d9e

Please sign in to comment.