Enable emscripten in CI for rustc 1.39.0 (#828)

.travis.yml

@@ -15,8 +15,7 @@ before_cache:
   - ./ci/clear_cache.sh
 
 rust:
-  # - 1.39.0 # min supported (enable when 1.40.0 is released)
-  - stable
+  - 1.39.0 # min supported
   - beta
   - nightly
 

ci/check_examples.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+echo "$(rustup default)" | grep -q "1.39.0"
+emscripten_supported=$?
 set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
 
 # Showcase includes all other examples
@@ -6,9 +8,11 @@ cd examples/showcase
 
 # TODO Can't build some demos with release, need fix
 
-# TODO - Emscripten builds are broken
-# cargo web build --target asmjs-unknown-emscripten
-# cargo web build --target wasm32-unknown-emscripten
+if [ "$emscripten_supported" == "0" ]; then
+  # TODO - Emscripten builds are broken on rustc > 1.39.0
+  cargo web build --target asmjs-unknown-emscripten
+  cargo web build --target wasm32-unknown-emscripten
+fi
 
 # TODO showcase doesn't support wasm-bindgen yet
 cargo web build --target wasm32-unknown-unknown

ci/run_tests.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
+echo "$(rustup default)" | grep -q "1.39.0"
+emscripten_supported=$?
 set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
 
-# TODO - Emscripten builds are broken
-# cargo web test --features web_test --target asmjs-unknown-emscripten
-# cargo web test --features web_test --target wasm32-unknown-emscripten
+if [ "$emscripten_supported" == "0" ]; then
+  # TODO - Emscripten builds are broken on rustc > 1.39.0
+  cargo web test --features web_test --target asmjs-unknown-emscripten
+  cargo web test --features web_test --target wasm32-unknown-emscripten
+fi
 
 cargo test --features wasm_test --target wasm32-unknown-unknown
 cargo test --test macro_test