Test all targets with Rust nightly, beta, stable, and 1.13.0

Author: gnzlbg

.travis.yml

@@ -1,31 +1,28 @@
 language: rust
-rust: stable
+rust: nightly
 sudo: required
 dist: xenial
 services: docker
 
 matrix:
   include:
-    # 1.13.0 compat
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: 1.13.0
-      script: rm -f Cargo.lock && cargo build
-      install: true
-
-    # build documentation
-    - env: TARGET=x86_64-unknown-linux-gnu
+    - name: "Documentation"
+      env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
       script: sh ci/dox.sh
       install: true
+    - name: "Shellcheck"
+      install: true
+      script:
+        - shellcheck --version
+        - shellcheck ci/*.sh
 
-    # stable compat
     - env: TARGET=x86_64-unknown-linux-gnu
-      install: true
     - env: TARGET=i686-unknown-linux-gnu
+    - env: TARGET=x86_64-unknown-linux-gnux32 OPT="--release"
     - os: osx
       env: TARGET=x86_64-apple-darwin
       osx_image: xcode10
-      install: true
     - os: osx
       env: TARGET=i686-apple-darwin
       osx_image: xcode10
@@ -52,48 +49,24 @@ matrix:
     - env: TARGET=sparc64-unknown-linux-gnu
     - env: TARGET=asmjs-unknown-emscripten
     - env: TARGET=wasm32-unknown-emscripten
-
-    # beta
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: beta
-      install: true
-    - os: osx
-      env: TARGET=x86_64-apple-darwin
-      osx_image: xcode10
-      rust: beta
-      install: true
-
-    # nightly
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: nightly
-      install: true
-    - os: osx
-      env: TARGET=x86_64-apple-darwin
-      osx_image: xcode10
-      rust: nightly
-      install: true
-    # not available on stable
-    # without --release the build fails
-    # see https://github.com/rust-lang/rust/issues/45417
-    - env: TARGET=x86_64-unknown-linux-gnux32 OPT="--release"
-      rust: nightly
-
     - env: TARGET=wasm32-unknown-unknown
       install: rustup target add $TARGET
       script: cargo build --no-default-features --target $TARGET --release
 
-    - name: "Shellcheck"
-      install: true
-      script:
-        - shellcheck --version
-        - shellcheck ci/*.sh
-
   allow_failures:
       # FIXME: https://github.com/rust-lang/libc/issues/1226
       - env: TARGET=asmjs-unknown-emscripten
       - env: TARGET=wasm32-unknown-emscripten
 
-install: rustup target add $TARGET
+install:
+  - rustup install beta
+  - rustup install stable
+  - rustup install 1.13.0
+  - rustup target add $TARGET || true
+  - rustup target add $TARGET --toolchain beta || true
+  - rustup target add $TARGET --toolchain stable || true
+  - rustup target add $TARGET --toolchain 1.13.0 || true
+
 script:
   - cargo generate-lockfile --manifest-path libc-test/Cargo.toml
   - if [[ $TRAVIS_OS_NAME = "linux" ]]; then

ci/run.sh

@@ -80,20 +80,33 @@ if [ "$QEMU" != "" ]; then
   exec grep "^PASSED .* tests" "${CARGO_TARGET_DIR}/out.log"
 fi
 
-# FIXME: x86_64-unknown-linux-gnux32 fail to compile without --release
-# See https://github.com/rust-lang/rust/issues/45417
-opt=
-if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
-  opt="--release"
-fi
+build_types="+nightly +beta +stable +1.13.0"
+for build_type in $build_types;
+do
+
+    opt=
+    if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
+        # FIXME: x86_64-unknown-linux-gnux32 fail to compile without --release
+        # See https://github.com/rust-lang/rust/issues/45417
+        opt="--release"
+
+        # x86_64-unknown-linux-gnux32 is only available on nightly:
+        if [ "$build_type" != "nightly" ]; then
+            continue
+        fi
+    fi
+
+    # Building with --no-default-features is currently broken on rumprun because we
+    # need cfg(target_vendor), which is currently unstable.
+    if [ "$TARGET" != "x86_64-rumprun-netbsd" ]; then
+        cargo "$build_type" test $opt --no-default-features --manifest-path libc-test/Cargo.toml --target "${TARGET}"
+    fi
+
+    # Test the #[repr(align(x))] feature; requires Rust >= 1.25.0
+    if [ "$build_type" != "+1.13.0" ]; then
+        cargo "$build_type" test $opt --features align --manifest-path libc-test/Cargo.toml --target "${TARGET}"
+    fi
+
+    exec cargo "$build_type" test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"
+done
 
-# Building with --no-default-features is currently broken on rumprun because we
-# need cfg(target_vendor), which is currently unstable.
-if [ "$TARGET" != "x86_64-rumprun-netbsd" ]; then
-  cargo test $opt --no-default-features --manifest-path libc-test/Cargo.toml --target "${TARGET}"
-fi
-# Test the #[repr(align(x))] feature if this is building on Rust >= 1.25
-if [ "$(rustc --version | sed -E 's/^rustc 1\.([0-9]*)\..*/\1/')" -ge 25 ]; then
-  cargo test $opt --features align --manifest-path libc-test/Cargo.toml --target "${TARGET}"
-fi
-exec cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"