Merge branch 'main' into dependabot/npm_and_yarn/minimist-1.2.6

google · May 23, 2022 · 8d0aaec · 8d0aaec
2 parents 0bd7aeb + f6ac01d
commit 8d0aaec
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,8 +8,9 @@ jobs:
   test-linux:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        node: [ 10, 12, 14, 15, 16]
+        node: [ 12, 14, 16, 17, 18 ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/package.json b/package.json
@@ -33,11 +33,11 @@
     "delay": "^5.0.0",
     "findit2": "^2.2.3",
     "nan": "^2.14.0",
-    "@mapbox/node-pre-gyp": "^1.0.0",
+    "@mapbox/node-pre-gyp": "^1.0.9",
     "p-limit": "^3.0.0",
     "pify": "^5.0.0",
     "protobufjs": "~6.11.0",
-    "source-map": "^0.7.3",
+    "source-map": "~0.8.0-beta.0",
     "split": "^1.0.1"
   },
   "devDependencies": {

diff --git a/system-test/Dockerfile.node10-alpine → system-test/Dockerfile.node17-alpine b/system-test/Dockerfile.node10-alpine → system-test/Dockerfile.node17-alpine
@@ -4,7 +4,7 @@ WORKDIR /root/
 RUN go get github.com/google/pprof
 
 
-FROM node:10-alpine
+FROM node:17-alpine
 
 ARG ADDITIONAL_PACKAGES
 

diff --git a/system-test/Dockerfile.node15-alpine → system-test/Dockerfile.node18-alpine b/system-test/Dockerfile.node15-alpine → system-test/Dockerfile.node18-alpine
@@ -4,7 +4,7 @@ WORKDIR /root/
 RUN go get github.com/google/pprof
 
 
-FROM node:15-alpine
+FROM node:18-alpine
 
 ARG ADDITIONAL_PACKAGES
 

diff --git a/system-test/system_test.sh b/system-test/system_test.sh
@@ -10,11 +10,15 @@ set -eox pipefail
 
 cd $(dirname $0)
 
+# The list of tested versions below should be in sync with node's
+# official releases. https://nodejs.org/en/about/releases/
 if [[ -z "$BINARY_HOST" ]]; then
   ADDITIONAL_PACKAGES="python3 g++ make"
-  NODE_VERSIONS=(10 12 14 15 16 node)
+  NODE_VERSIONS=(12 14 16 17 18 node)
 else
-  NODE_VERSIONS=(10 12 14 15 16)
+  # Tested versions for pre-built binaries are limited based on
+  # what node-pre-gyp can specify as its target version.
+  NODE_VERSIONS=(12 14 16 17)
 fi
 
 for i in ${NODE_VERSIONS[@]}; do
@@ -26,13 +30,9 @@ for i in ${NODE_VERSIONS[@]}; do
   docker run  -v $PWD/..:/src -e BINARY_HOST="$BINARY_HOST" node$i-linux \
       /src/system-test/test.sh
 
-  # Test support for accurate line numbers with node versions supporting this
-  # feature.
-  if [ "$i" != "10" ]; then
-    docker run  -v $PWD/..:/src -e BINARY_HOST="$BINARY_HOST" \
-        -e VERIFY_TIME_LINE_NUMBERS="true" node$i-linux \
-        /src/system-test/test.sh
-  fi
+  docker run  -v $PWD/..:/src -e BINARY_HOST="$BINARY_HOST" \
+      -e VERIFY_TIME_LINE_NUMBERS="true" node$i-linux \
+      /src/system-test/test.sh
 
   # Test Alpine support for the given node version.
   retry docker build -f Dockerfile.node$i-alpine \

diff --git a/system-test/test.sh b/system-test/test.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-trap "cd $(dirname $0)/.. && npm run clean" EXIT
-trap "echo '** TEST FAILED **'" ERR
+SRCDIR="/cloned_src"
 
-. $(dirname $0)/../tools/retry.sh
+trap "cd $SRCDIR && npm run clean" EXIT
+trap "echo '** TEST FAILED **'" ERR
 
 function timeout_after() {
   # timeout on Node 11 alpine image requires -t to specify time.
@@ -19,7 +19,9 @@ npm_install() {
 }
 
 set -eox pipefail
-cd $(dirname $0)/..
+cp -r /src "$SRCDIR"
+cd "$SRCDIR"
+. "tools/retry.sh"
 
 NODEDIR=$(dirname $(dirname $(which node)))
 

diff --git a/tools/build/build.sh b/tools/build/build.sh
@@ -28,7 +28,7 @@ mkdir -p "$ARTIFACTS_OUT"
 
 npm install --quiet
 
-for version in 10.0.0 12.0.0 14.0.0 15.0.0 16.0.0
+for version in 12.0.0 14.0.0 16.0.0 17.0.1
 do
   ./node_modules/.bin/node-pre-gyp configure rebuild package \
       --target=$version --target_arch="x64"