Disable emscripten in CI for beta/nightly (#731)

* Update emscripten

* Don't fail on rustup check

* Disable emscripten for non-stable builds

* Try with cargo-web emscripten

* Revert system emscripten stuff
This commit is contained in:
Justin Starry 2019-11-23 17:13:13 -05:00 committed by GitHub
parent 1218c1de33
commit ff042058e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 6 deletions

View File

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

View File

@ -1,12 +1,21 @@
#!/usr/bin/env bash
echo "$(rustup default)" | grep -q "stable"
is_stable=$?
set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
# Showcase includes all other examples
cd examples/showcase
# TODO Can't build some demos with release, need fix
cargo web build --target asmjs-unknown-emscripten
cargo web build --target wasm32-unknown-emscripten
if [ "$is_stable" == "0" ]; then
# TODO - Emscripten builds are broken on beta/nightly
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
# Reset cwd
cd ../..

View File

@ -1,8 +1,14 @@
#!/usr/bin/env bash
echo "$(rustup default)" | grep -q "stable"
is_stable=$?
set -euxo pipefail # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
cargo web test --features web_test --target asmjs-unknown-emscripten
cargo web test --features web_test --target wasm32-unknown-emscripten
if [ "$is_stable" == "0" ]; then
# TODO - Emscripten builds are broken on beta/nightly
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
cargo test --test derive_props_test