From 64b6f32b7b9772e24300e1f459892f8a9046404c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= Date: Tue, 22 Oct 2019 18:19:38 +0000 Subject: [PATCH] Node 13 support --- .travis.yml | 19 ++++++++++++++++--- README.md | 1 + appveyor.yml | 6 ++++++ lib/extensions.js | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ad4bf424..d2a3dadc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,12 @@ jobs: - stage: platform-test node_js: "node" os: osx + - stage: platform-test + node_js: "12" + os: linux + - stage: platform-test + node_js: "12" + os: osx - stage: platform-test node_js: "11" os: linux @@ -74,12 +80,19 @@ addons: - g++-4.7 - gcc-4.9 - g++-4.9 + - gcc-6 + - g++-6 before_install: - echo $TRAVIS_NODE_VERSION - npm config set python `which python` - if [ $TRAVIS_OS_NAME == "linux" ]; then - if [[ $(node -v) =~ v[1-9][0-9] ]]; then + if [[ $(node -v) =~ v13 ]]; then + export CC="gcc-6"; + export CXX="g++-6"; + export LINK="gcc-6"; + export LINKXX="g++-6"; + elif [[ $(node -v) =~ v[1-9][0-9] ]]; then export CC="gcc-4.9"; export CXX="g++-4.9"; export LINK="gcc-4.9"; @@ -94,8 +107,8 @@ before_install: - nvm --version - node --version - npm --version - - gcc --version - - g++ --version + - ${CC:-gcc} --version + - ${CXX:-g++} --version install: - npm install diff --git a/README.md b/README.md index 0e035bed5..c88dfa215 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ NodeJS | Minimum node-sass version | Node Module --------|--------------------------|------------ +Node 13 | (not yet release) | 79 Node 12 | 4.12+ | 72 Node 11 | 4.10+ | 67 Node 10 | 4.9+ | 64 diff --git a/appveyor.yml b/appveyor.yml index bfd75922a..077c65a3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -76,6 +76,9 @@ - nodejs_version: 12 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 13 + GYP_MSVS_VERSION: 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 install: # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs @@ -173,6 +176,9 @@ - nodejs_version: 12 GYP_MSVS_VERSION: 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - nodejs_version: 13 + GYP_MSVS_VERSION: 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 install: # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs diff --git a/lib/extensions.js b/lib/extensions.js index d2f1fe879..1e344c40e 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -78,6 +78,7 @@ function getHumanNodeVersion(abi) { case 64: return 'Node.js 10.x'; case 67: return 'Node.js 11.x'; case 72: return 'Node.js 12.x'; + case 79: return 'Node.js 13.x'; default: return false; } }