Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test node 18/20, minimum version 18.19.0 #1517

Merged
merged 1 commit into from
Mar 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .build/check-prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ check_npm_version() {
}

check_node_version() {
required_version="14.19.0"
required_version="18.19.0"
installed_version=$(node --version | cut -c2-)
versions="$required_version\n$installed_version"
if echo -e $versions | sort -rV | head -n 1 | grep -q "$installed_version"; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
fail-fast: false
matrix:
adaptor: ${{ fromJSON(needs.changes.outputs.adaptor) }}
node-version: [14.x, 16.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.x
- name: Publish Caliper
run: .build/publish-caliper.sh
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [18.x, 20.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Run unit tests
run: npm test --workspaces
- name: Upload coverage reports artifact
if: matrix.node-version == '16.x'
if: matrix.node-version == '18.x'
uses: actions/upload-artifact@v3
with:
name: coverage-reports
Expand Down
1,303 changes: 920 additions & 383 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"force-clean": "./scripts/force-clean.sh"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=7.24.2"
},
"dependencies": {},
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-ethereum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-fabric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/caliper-gui-dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"map-sass": "node-sass src/assets/scss/paper-dashboard.scss src/assets/css/paper-dashboard.css --source-map true"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand All @@ -38,7 +38,7 @@
"history": "4.10.1",
"js-yaml": "^3.13.1",
"mime-types": "^2.1.24",
"node-sass": "7.0.1",
"node-sass": "9.0.0",
"patternomaly": "^1.3.2",
"perfect-scrollbar": "1.5.0",
"react": "^16.12.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-gui-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"start": "node app.js"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-publish/caliper.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.
#

FROM node:14.19-alpine
FROM node:18.19-alpine

# require to set these explicitly to avoid mistakes
ARG npm_registry
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-tests-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"description": "Integration tests for Hyperledger Caliper",
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions packages/generator-caliper/lib/generators/dummy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Needs investigation

For some reason the yo generator integration tests fails unless lib/generators directory exists when moved to node18/20.
2 changes: 1 addition & 1 deletion packages/generator-caliper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nyc": "nyc --reporter=text --reporter=clover mocha --recursive -t 10000"
},
"engines": {
"node": ">=14.19.0",
"node": ">=18.19.0",
"npm": ">=6.14.16"
},
"files": [
Expand Down
Loading