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

chore: Run tests with Node 15 #146

Merged
merged 1 commit into from
Dec 4, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [ 10, 12, 14]
node: [ 10, 12, 14, 15]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion system-test/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ARG VERIFY_TIME_LINE_NUMBERS
RUN apt-get update && apt-get install -y curl $ADDITIONAL_PACKAGES \
&& rm -rf /var/lib/apt/lists/*

ENV NVM_DIR /root/.nvm
ENV NVM_DIR /bin/.nvm
RUN mkdir -p $NVM_DIR


Expand Down
14 changes: 14 additions & 0 deletions system-test/Dockerfile.node15-alpine
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM golang:1.15-alpine as builder
RUN apk add --no-cache git
WORKDIR /root/
RUN go get github.com/google/pprof


FROM node:15-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
4 changes: 2 additions & 2 deletions system-test/system_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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=(10 12 14)
NODE_VERSIONS=(10 12 14 15)
fi

for i in ${NODE_VERSIONS[@]}; do
Expand All @@ -33,7 +33,7 @@ for i in ${NODE_VERSIONS[@]}; do

# Test support for accurate line numbers with node versions supporting this
# feature.
if [ "$i" != "10" ] && [ "$i" != "11" ]; then
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
Expand Down
1 change: 1 addition & 0 deletions system-test/test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

trap "cd $(dirname $0)/.. && npm run clean" EXIT
trap "echo '** TEST FAILED **'" ERR

. $(dirname $0)/../tools/retry.sh
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 --quiet

for version in 10.0.0 12.0.0 14.0.0
for version in 10.0.0 12.0.0 14.0.0 15.0.0
do
./node_modules/.bin/node-pre-gyp configure rebuild package \
--target=$version --target_arch="x64"
Expand Down