From 7e81223ba2e496debaee8742fa436703f5d8bc1e Mon Sep 17 00:00:00 2001 From: Amila Welihinda Date: Thu, 22 Nov 2018 15:47:44 -0800 Subject: [PATCH 1/2] windows ci fixes --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index adb3fec..21d277d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ matrix: rust: nightly-2018-10-12 env: - TRAVIS_NODE_VERSION="10" - - os: linux language: rust rust: nightly-2018-10-12 @@ -22,12 +21,6 @@ matrix: - gcc-multilib - g++-8 - g++-multilib - - - os: windows - language: node_js - node_js: - - node - - os: windows language: rust rust: nightly-2018-10-12 @@ -42,6 +35,7 @@ cache: before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-8"; fi + - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install nodejs; fi - nvm install $TRAVIS_NODE_VERSION - nvm use ${TRAVIS_NODE_VERSION} - node -v From c4035d8b5fcab480300e7545c08659bd709f09a8 Mon Sep 17 00:00:00 2001 From: Amila Welihinda Date: Sat, 2 Feb 2019 12:07:45 -0800 Subject: [PATCH 2/2] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21d277d..a2d9a18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,7 @@ cache: before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-8"; fi - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install nodejs; fi - - nvm install $TRAVIS_NODE_VERSION - - nvm use ${TRAVIS_NODE_VERSION} + - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION; fi - node -v - npm -v - npm i -g yarn@latest