test node 18/20, minimum version 18.19.0

- concern here is that although this passes the tests (which now fail due to the node version change which is really strange) what effect this will have on the final packaged version of the generator. Signed-off-by: Dave Kelsey <[email protected]>
hyperledger-caliper · Mar 1, 2024 · 945fc56 · 945fc56
1 parent 31b978f
commit 945fc56
Show file tree

Hide file tree

Showing 19 changed files with 546 additions and 267 deletions.
diff --git a/.build/check-prerequisites.sh b/.build/check-prerequisites.sh
@@ -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

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -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 }}

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -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 }}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
         "force-clean": "./scripts/force-clean.sh"
     },
     "engines": {
-        "node": ">=14.19.0",
+        "node": ">=18.19.0",
         "npm": ">=7.24.2"
     },
     "dependencies": {},

diff --git a/packages/caliper-cli/package.json b/packages/caliper-cli/package.json
@@ -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": {

diff --git a/packages/caliper-core/package.json b/packages/caliper-core/package.json
@@ -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": {

diff --git a/packages/caliper-ethereum/package.json b/packages/caliper-ethereum/package.json
@@ -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": {

diff --git a/packages/caliper-fabric/package.json b/packages/caliper-fabric/package.json
@@ -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": {

diff --git a/packages/caliper-gui-dashboard/package.json b/packages/caliper-gui-dashboard/package.json
@@ -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": {
@@ -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",

diff --git a/packages/caliper-gui-server/package.json b/packages/caliper-gui-server/package.json
@@ -18,7 +18,7 @@
         "start": "node app.js"
     },
     "engines": {
-        "node": ">=14.19.0",
+        "node": ">=18.19.0",
         "npm": ">=6.14.16"
     },
     "dependencies": {

diff --git a/packages/caliper-publish/caliper.Dockerfile b/packages/caliper-publish/caliper.Dockerfile
@@ -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

diff --git a/packages/caliper-publish/package.json b/packages/caliper-publish/package.json
@@ -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": {

diff --git a/packages/caliper-tests-integration/package.json b/packages/caliper-tests-integration/package.json
@@ -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": {

diff --git a/...generator-caliper/generators/app/index.js → ...rator-caliper/lib/generators/app/index.js b/...generator-caliper/generators/app/index.js → ...rator-caliper/lib/generators/app/index.js
diff --git a/...tor-caliper/generators/benchmark/index.js → ...caliper/lib/generators/benchmark/index.js b/...tor-caliper/generators/benchmark/index.js → ...caliper/lib/generators/benchmark/index.js
diff --git a/...enerators/benchmark/templates/config.yaml → ...enerators/benchmark/templates/config.yaml b/...enerators/benchmark/templates/config.yaml → ...enerators/benchmark/templates/config.yaml
diff --git a/...enerators/benchmark/templates/workload.js → ...enerators/benchmark/templates/workload.js b/...enerators/benchmark/templates/workload.js → ...enerators/benchmark/templates/workload.js
diff --git a/packages/generator-caliper/package.json b/packages/generator-caliper/package.json
@@ -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": [