Enable emscripten in CI for rustc 1.39.0 (#828)

This commit is contained in:
Justin Starry 2019-12-28 18:03:39 -06:00 committed by GitHub
parent d1e881cd43
commit 3ffde502a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions

View File

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

View File

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

View File

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