only use nvm on mac

chronotope · Aug 16, 2019 · 7fdc070 · 7fdc070
1 parent 93e4f29
commit 7fdc070
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,8 +23,9 @@ env:
     - 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
@@ -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