CI fixy stuff so that we can built on 1.31 (hopefully)

This commit is contained in:
Lokathor 2019-11-25 19:15:11 -07:00
parent c4f25466fa
commit 389e4e5a27
5 changed files with 21 additions and 26 deletions

View File

@ -30,23 +30,23 @@ matrix:
# If we wanted to flag on --release mode we'd add a line like this
#- { os: linux, rust: 1.38.0, env: FLAGS=--release }
- { os: linux, rust: 1.38.0, env: TARGET=wasm32-unknown-unknown }
- { os: linux, rust: 1.38.0, env: TARGET=wasm32-wasi }
- { os: linux, rust: 1.31.0, env: TARGET=wasm32-unknown-unknown }
- { os: linux, rust: 1.31.0, env: TARGET=wasm32-wasi }
- { os: linux, rust: 1.38.0, env: TARGET=aarch64-linux-android }
- { os: linux, rust: 1.38.0, env: TARGET=armv7-linux-androideabi }
- { os: linux, rust: 1.38.0, env: TARGET=i686-linux-android }
- { os: linux, rust: 1.38.0, env: TARGET=x86_64-linux-android }
- { os: linux, rust: 1.31.0, env: TARGET=aarch64-linux-android }
- { os: linux, rust: 1.31.0, env: TARGET=armv7-linux-androideabi }
- { os: linux, rust: 1.31.0, env: TARGET=i686-linux-android }
- { os: linux, rust: 1.31.0, env: TARGET=x86_64-linux-android }
- { os: linux, rust: 1.38.0, env: TARGET=arm-unknown-linux-gnueabihf }
- { os: linux, rust: 1.38.0, env: TARGET=armv7-unknown-linux-gnueabihf }
- { os: linux, rust: 1.38.0, env: TARGET=thumbv7neon-unknown-linux-gnueabihf }
- { os: linux, rust: 1.31.0, env: TARGET=arm-unknown-linux-gnueabihf }
- { os: linux, rust: 1.31.0, env: TARGET=armv7-unknown-linux-gnueabihf }
- { os: linux, rust: 1.31.0, env: TARGET=thumbv7neon-unknown-linux-gnueabihf }
- { os: osx, rust: 1.38.0, env: TARGET=aarch64-apple-ios }
- { os: osx, rust: 1.38.0, env: TARGET=armv7-apple-ios }
- { os: osx, rust: 1.38.0, env: TARGET=armv7s-apple-ios }
- { os: osx, rust: 1.38.0, env: TARGET=i386-apple-ios }
- { os: osx, rust: 1.38.0, env: TARGET=x86_64-apple-ios }
- { os: osx, rust: 1.31.0, env: TARGET=aarch64-apple-ios }
- { os: osx, rust: 1.31.0, env: TARGET=armv7-apple-ios }
- { os: osx, rust: 1.31.0, env: TARGET=armv7s-apple-ios }
- { os: osx, rust: 1.31.0, env: TARGET=i386-apple-ios }
- { os: osx, rust: 1.31.0, env: TARGET=x86_64-apple-ios }
script:
- pushd scripts

View File

@ -14,7 +14,6 @@ license = "Zlib"
all-features = true
[features]
default = ["extern_crate_alloc"]
extern_crate_alloc = []
[badges]

View File

@ -8,7 +8,3 @@
# bytemuck
A crate for mucking around with piles of bytes.
CI coverage:
* Tested on: `x86`, `x86_64`, `wasm`
* Built on: `armv7`, `aarch64`, `thumbv7neon`

View File

@ -42,4 +42,4 @@ test_script:
- cargo clippy
- cargo test --no-default-features
- cargo test
- cargo test --all-features
#- cargo test --all-features

View File

@ -11,21 +11,21 @@ if [[ "$TARGET" == "wasm32-"* && "$TARGET" != "wasm32-wasi" ]]; then
cargo-web --version || cargo install cargo-web
cargo web test --no-default-features $FLAGS --target=$TARGET
cargo web test $FLAGS --target=$TARGET
cargo web test --all-features $FLAGS --target=$TARGET
#cargo web test --all-features $FLAGS --target=$TARGET
elif [[ "$TARGET" == *"-linux-android"* ]]; then
export PATH=/usr/local/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
pushd linux-android
cargo build --no-default-features --target=$TARGET $FLAGS
cargo build --target=$TARGET $FLAGS
cargo build --all-features --target=$TARGET $FLAGS
#cargo build --all-features --target=$TARGET $FLAGS
# Don't test, can't run android emulators successfully on travis currently
popd
elif [[ "$TARGET" == *"-apple-ios" || "$TARGET" == "wasm32-wasi" ]]; then
cargo build --no-default-features --target=$TARGET $FLAGS
cargo build --target=$TARGET $FLAGS
cargo build --all-features --target=$TARGET $FLAGS
#cargo build --all-features --target=$TARGET $FLAGS
# Don't test
# iOS simulator setup/teardown is complicated
# cargo-web doesn't support wasm32-wasi yet, nor can wasm-pack test specify a target
@ -36,7 +36,7 @@ elif [[ "$TARGET" == *"-unknown-linux-gnueabihf" ]]; then
pushd generic-cross
cargo build --no-default-features --target=$TARGET $FLAGS
cargo build --target=$TARGET $FLAGS
cargo build --all-features --target=$TARGET $FLAGS
#cargo build --all-features --target=$TARGET $FLAGS
# Don't test
popd
@ -44,12 +44,12 @@ elif [[ "$TARGET" != "" ]]; then
pushd generic-cross
cargo test --no-default-features --target=$TARGET $FLAGS
cargo test --target=$TARGET $FLAGS
cargo test --all-features --target=$TARGET $FLAGS
#cargo test --all-features --target=$TARGET $FLAGS
popd
else
# Push nothing, target host CPU architecture
cargo test --no-default-features $FLAGS
cargo test $FLAGS
cargo test --all-features $FLAGS
#cargo test --all-features $FLAGS
fi