From 389e4e5a27cb5e7604df780d3e987738555a743b Mon Sep 17 00:00:00 2001 From: Lokathor Date: Mon, 25 Nov 2019 19:15:11 -0700 Subject: [PATCH] CI fixy stuff so that we can built on 1.31 (hopefully) --- .travis.yml | 28 ++++++++++++++-------------- Cargo.toml | 1 - README.md | 4 ---- appveyor.yml | 2 +- scripts/travis.sh | 12 ++++++------ 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff59b33..d004ad5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Cargo.toml b/Cargo.toml index 551deed..0f9fd30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ license = "Zlib" all-features = true [features] -default = ["extern_crate_alloc"] extern_crate_alloc = [] [badges] diff --git a/README.md b/README.md index d145f85..651216e 100644 --- a/README.md +++ b/README.md @@ -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` diff --git a/appveyor.yml b/appveyor.yml index 366faf1..9acda12 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,4 +42,4 @@ test_script: - cargo clippy - cargo test --no-default-features - cargo test - - cargo test --all-features + #- cargo test --all-features diff --git a/scripts/travis.sh b/scripts/travis.sh index 77884a5..4001be5 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -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