Unverified Commit e84c6a9f by Michael Mifsud Committed by GitHub

Merge pull request #2766 from saper/node-modules-79

Node 13 support
parents 8d0accab 64b6f32b
...@@ -17,6 +17,12 @@ jobs: ...@@ -17,6 +17,12 @@ jobs:
node_js: "node" node_js: "node"
os: osx os: osx
- stage: platform-test - stage: platform-test
node_js: "12"
os: linux
- stage: platform-test
node_js: "12"
os: osx
- stage: platform-test
node_js: "11" node_js: "11"
os: linux os: linux
- stage: platform-test - stage: platform-test
...@@ -74,12 +80,19 @@ addons: ...@@ -74,12 +80,19 @@ addons:
- g++-4.7 - g++-4.7
- gcc-4.9 - gcc-4.9
- g++-4.9 - g++-4.9
- gcc-6
- g++-6
before_install: before_install:
- echo $TRAVIS_NODE_VERSION - echo $TRAVIS_NODE_VERSION
- npm config set python `which python` - npm config set python `which python`
- if [ $TRAVIS_OS_NAME == "linux" ]; then - 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 CC="gcc-4.9";
export CXX="g++-4.9"; export CXX="g++-4.9";
export LINK="gcc-4.9"; export LINK="gcc-4.9";
...@@ -94,8 +107,8 @@ before_install: ...@@ -94,8 +107,8 @@ before_install:
- nvm --version - nvm --version
- node --version - node --version
- npm --version - npm --version
- gcc --version - ${CC:-gcc} --version
- g++ --version - ${CXX:-g++} --version
install: install:
- npm install - npm install
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
NodeJS | Minimum node-sass version | Node Module NodeJS | Minimum node-sass version | Node Module
--------|--------------------------|------------ --------|--------------------------|------------
Node 13 | (not yet release) | 79
Node 12 | 4.12+ | 72 Node 12 | 4.12+ | 72
Node 11 | 4.10+ | 67 Node 11 | 4.10+ | 67
Node 10 | 4.9+ | 64 Node 10 | 4.9+ | 64
......
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
- nodejs_version: 12 - nodejs_version: 12
GYP_MSVS_VERSION: 2017 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 13
GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
install: install:
# https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
...@@ -173,6 +176,9 @@ ...@@ -173,6 +176,9 @@
- nodejs_version: 12 - nodejs_version: 12
GYP_MSVS_VERSION: 2017 GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- nodejs_version: 13
GYP_MSVS_VERSION: 2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
install: install:
# https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs # https://www.appveyor.com/docs/lang/nodejs-iojs/#installing-any-version-of-nodejs-or-iojs
......
...@@ -78,6 +78,7 @@ function getHumanNodeVersion(abi) { ...@@ -78,6 +78,7 @@ function getHumanNodeVersion(abi) {
case 64: return 'Node.js 10.x'; case 64: return 'Node.js 10.x';
case 67: return 'Node.js 11.x'; case 67: return 'Node.js 11.x';
case 72: return 'Node.js 12.x'; case 72: return 'Node.js 12.x';
case 79: return 'Node.js 13.x';
default: return false; default: return false;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment