Skip to content

Commit

Permalink
feat: add pre-built binaries for Node 12
Browse files Browse the repository at this point in the history
  • Loading branch information
nolanmar511 committed Jun 13, 2019
1 parent a889539 commit a931c6e
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 10 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion system-test/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion system-test/Dockerfile.node10-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion system-test/Dockerfile.node11-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 14 additions & 0 deletions system-test/Dockerfile.node12-alpine
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion system-test/Dockerfile.node8-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion system-test/system_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions tools/kokoro/unit-test/continuous-linux-node12.cfg
Original file line number Diff line number Diff line change
@@ -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"
}
12 changes: 12 additions & 0 deletions tools/kokoro/unit-test/presubmit-linux-node12.cfg
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit a931c6e

Please sign in to comment.