diff --git a/package-lock.json b/package-lock.json index 24a7bc64..6ee1c7ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2878,9 +2878,9 @@ "dev": true }, "nan": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz", - "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==" + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" }, "needle": { "version": "2.3.1", diff --git a/package.json b/package.json index 4fb1b6e1..73bb9d6c 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "bindings": "^1.2.1", "delay": "^4.0.1", "findit2": "^2.2.3", - "nan": "^2.12.1", + "nan": "^2.14.0", "node-pre-gyp": "^0.13.0", "p-limit": "^2.0.0", "pify": "^4.0.0", diff --git a/system-test/Dockerfile.linux b/system-test/Dockerfile.linux index 8798f0d5..a3f61b16 100644 --- a/system-test/Dockerfile.linux +++ b/system-test/Dockerfile.linux @@ -26,4 +26,4 @@ RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | b ENV BASH_ENV /root/.bashrc WORKDIR /root/ -COPY --from=0 /go/bin/pprof /bin +COPY --from=builder /go/bin/pprof /bin diff --git a/system-test/Dockerfile.node10-alpine b/system-test/Dockerfile.node10-alpine index 20439084..0c8fecdd 100644 --- a/system-test/Dockerfile.node10-alpine +++ b/system-test/Dockerfile.node10-alpine @@ -10,5 +10,5 @@ ARG ADDITIONAL_PACKAGES RUN apk add --no-cache bash $ADDITIONAL_PACKAGES WORKDIR /root/ -COPY --from=0 /go/bin/pprof /bin +COPY --from=builder /go/bin/pprof /bin RUN chmod a+x /bin/pprof diff --git a/system-test/Dockerfile.node11-alpine b/system-test/Dockerfile.node11-alpine index b2e609ab..528e0dee 100644 --- a/system-test/Dockerfile.node11-alpine +++ b/system-test/Dockerfile.node11-alpine @@ -10,5 +10,5 @@ ARG ADDITIONAL_PACKAGES RUN apk add --no-cache bash $ADDITIONAL_PACKAGES WORKDIR /root/ -COPY --from=0 /go/bin/pprof /bin +COPY --from=builder /go/bin/pprof /bin RUN chmod a+x /bin/pprof diff --git a/system-test/Dockerfile.node12-alpine b/system-test/Dockerfile.node12-alpine new file mode 100644 index 00000000..b48388c8 --- /dev/null +++ b/system-test/Dockerfile.node12-alpine @@ -0,0 +1,14 @@ +FROM golang:1.12-alpine as builder +RUN apk add --no-cache git +WORKDIR /root/ +RUN go get github.com/google/pprof + + +FROM node:12-alpine + +ARG ADDITIONAL_PACKAGES + +RUN apk add --no-cache bash $ADDITIONAL_PACKAGES +WORKDIR /root/ +COPY --from=builder /go/bin/pprof /bin +RUN chmod a+x /bin/pprof diff --git a/system-test/Dockerfile.node8-alpine b/system-test/Dockerfile.node8-alpine index 759efe63..19f894e8 100644 --- a/system-test/Dockerfile.node8-alpine +++ b/system-test/Dockerfile.node8-alpine @@ -10,5 +10,5 @@ ARG ADDITIONAL_PACKAGES RUN apk add --no-cache bash $ADDITIONAL_PACKAGES WORKDIR /root/ -COPY --from=0 /go/bin/pprof /bin +COPY --from=builder /go/bin/pprof /bin RUN chmod a+x /bin/pprof diff --git a/system-test/system_test.sh b/system-test/system_test.sh index da387b36..effa3e4c 100755 --- a/system-test/system_test.sh +++ b/system-test/system_test.sh @@ -20,7 +20,7 @@ if [[ "$RUN_ONLY_V8_CANARY_TEST" == "true" ]]; then NVM_NODEJS_ORG_MIRROR="https://nodejs.org/download/v8-canary" NODE_VERSIONS=(node) else - NODE_VERSIONS=(8 10 11) + NODE_VERSIONS=(8 10 11 12) fi for i in ${NODE_VERSIONS[@]}; do diff --git a/tools/build/build.sh b/tools/build/build.sh index 02554bc4..d9e54b67 100755 --- a/tools/build/build.sh +++ b/tools/build/build.sh @@ -28,7 +28,7 @@ mkdir -p "$ARTIFACTS_OUT" npm install -for version in 6.0.0 8.0.0 10.0.0 11.0.0 +for version in 6.0.0 8.0.0 10.0.0 11.0.0 12.0.0 do ./node_modules/.bin/node-pre-gyp configure rebuild package \ --target=$version --target_arch="x64" diff --git a/tools/kokoro/unit-test/continuous-linux-node12.cfg b/tools/kokoro/unit-test/continuous-linux-node12.cfg new file mode 100644 index 00000000..9413de18 --- /dev/null +++ b/tools/kokoro/unit-test/continuous-linux-node12.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/pprof-nodejs/tools/test.sh" +} diff --git a/tools/kokoro/unit-test/presubmit-linux-node12.cfg b/tools/kokoro/unit-test/presubmit-linux-node12.cfg new file mode 100644 index 00000000..9413de18 --- /dev/null +++ b/tools/kokoro/unit-test/presubmit-linux-node12.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:12-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/pprof-nodejs/tools/test.sh" +}