From bd22644b0542753a167887a6d8209be859c230cd Mon Sep 17 00:00:00 2001 From: eV Date: Fri, 16 Aug 2019 20:04:09 +0000 Subject: [PATCH] only use nvm on mac --- .travis.yml | 6 +++--- ci/travis.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c39a358..d591b2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ env: - LD_LIBRARY_PATH: /usr/local/lib - CLIPPY: n install: - - source $HOME/.nvm/nvm.sh - - nvm install 10 - - nvm use 10 + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then source $HOME/.nvm/nvm.sh; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then nvm install 10; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then nvm use 10; fi - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh script: ./ci/travis.sh notifications: diff --git a/ci/travis.sh b/ci/travis.sh index f299504..b5925cf 100755 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -51,8 +51,8 @@ build_and_test() { if [ -n "${TRAVIS}" ]; then # wasm tests touch tests/wasm.rs # ensure rebuild happens so TZ / NOW take effect - #TZ=ACST-9:30 NOW=$(date +%s) wasm-pack test --node - #touch tests/wasm.rs + TZ=ACST-9:30 NOW=$(date +%s) wasm-pack test --node + touch tests/wasm.rs TZ=EST4 NOW=$(date +%s) wasm-pack test --node touch tests/wasm.rs TZ=UTC0 NOW=$(date +%s) wasm-pack test --node