From 87f191fd058a76d929d49256b0558f678a823a44 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Thu, 3 Jan 2019 14:01:18 +0000 Subject: [PATCH] Node 11 now supported by nodejs/nan --- .travis.yml | 12 ++++-------- appveyor.yml | 1 - package.json | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7866bc8..23dc1e37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,12 @@ matrix: after_success: - npm install coveralls - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - - name: "Linux (glibc) - Node 11 (Experimental)" + - name: "Linux (glibc) - Node 11" os: linux dist: trusty sudo: false language: node_js node_js: "11" - before_install: - - unset PREBUILD_TOKEN - name: "Linux (musl) - Node 8" os: linux dist: trusty @@ -49,13 +47,13 @@ matrix: - sudo docker exec sharp apk add build-base git python2 --update-cache install: sudo docker exec sharp sh -c "npm install --unsafe-perm" script: sudo docker exec sharp sh -c "npm test" - - name: "Linux (musl) - Node 11 (Experimental)" + - name: "Linux (musl) - Node 11" os: linux dist: trusty sudo: true language: minimal before_install: - - sudo docker run -dit --name sharp --env CI --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:11-alpine + - sudo docker run -dit --name sharp --env CI --env PREBUILD_TOKEN --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:11-alpine - sudo docker exec sharp apk add build-base git python2 --update-cache install: sudo docker exec sharp sh -c "npm install --unsafe-perm" script: sudo docker exec sharp sh -c "npm test" @@ -74,10 +72,8 @@ matrix: osx_image: xcode9.2 language: node_js node_js: "10" - - name: "OS X - Node 11 (Experimental)" + - name: "OS X - Node 11" os: osx osx_image: xcode9.2 language: node_js node_js: "11" - before_install: - - unset PREBUILD_TOKEN diff --git a/appveyor.yml b/appveyor.yml index 00634e19..20bcb731 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,6 @@ environment: - nodejs_version: "8" - nodejs_version: "10" - nodejs_version: "11" - PREBUILD_TOKEN: "" install: - ps: Install-Product node $env:nodejs_version x64 - npm install -g npm@5 diff --git a/package.json b/package.json index 3be67d68..0da7a181 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "color": "^3.1.0", "detect-libc": "^1.0.3", "fs-copy-file-sync": "^1.1.1", - "nan": "^2.11.1", + "nan": "^2.12.1", "npmlog": "^4.1.2", "prebuild-install": "^5.2.2", "semver": "^5.6.0",