From 408903d451f8b5789a92d15e35ea66cf01f51888 Mon Sep 17 00:00:00 2001 From: xzyfer Date: Wed, 25 Apr 2018 16:06:39 +1000 Subject: [PATCH 1/2] Add Node 10 to CI --- .travis.yml | 6 ++++++ appveyor.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8893c565e..f7d17297d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,12 @@ jobs: - stage: platform-test node_js: "node" os: osx + - stage: platform-test + node_js: "9" + os: linux + - stage: platform-test + node_js: "9" + os: osx - stage: platform-test node_js: "7" os: linux diff --git a/appveyor.yml b/appveyor.yml index bcf5b4d47..fad8c01bb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,6 +67,9 @@ - nodejs_version: 9 GYP_MSVS_VERSION: 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - nodejs_version: 10 + GYP_MSVS_VERSION: 2015 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 install: - ps: Install-Product node $env:nodejs_version $env:platform @@ -148,6 +151,9 @@ - nodejs_version: 9 GYP_MSVS_VERSION: 2015 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + - nodejs_version: 10 + GYP_MSVS_VERSION: 2015 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 install: - ps: Install-Product node $env:nodejs_version $env:platform From f50b97458e7347c56c8f17491ed63643d1b4dcb3 Mon Sep 17 00:00:00 2001 From: xzyfer Date: Wed, 25 Apr 2018 16:37:20 +1000 Subject: [PATCH 2/2] Bump gcc@4.9 for Node 10 --- .travis.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7d17297d..018399b3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,14 +55,24 @@ addons: packages: - gcc-4.7 - g++-4.7 + - gcc-4.9 + - g++-4.9 before_install: + - echo $TRAVIS_NODE_VERSION - npm config set python `which python` - if [ $TRAVIS_OS_NAME == "linux" ]; then - export CC="gcc-4.7"; - export CXX="g++-4.7"; - export LINK="gcc-4.7"; - export LINKXX="g++-4.7"; + if [[ $(node -v) =~ "10" ]]; then + export CC="gcc-4.9"; + export CXX="g++-4.9"; + export LINK="gcc-4.9"; + export LINKXX="g++-4.9"; + else + export CC="gcc-4.7"; + export CXX="g++-4.7"; + export LINK="gcc-4.7"; + export LINKXX="g++-4.7"; + fi fi - nvm --version - node --version