Reduce Travis builds

Author: Jethro Beekman

.travis.yml

@@ -23,28 +23,23 @@ addons:
     - qemu-user
 rust:
    - stable
-   - beta
-   - nightly
-   - nightly-2021-03-25
 env:
   jobs:
-    # Matrix build of 3 targets against the above rust toolchain releases
+    # Matrix build of 3 targets against Rust stable
+    - TARGET=x86_64-unknown-linux-gnu ZLIB_INSTALLED=true AES_NI_SUPPORT=true
     - TARGET=aarch64-unknown-linux-musl
     - TARGET=x86_64-fortanix-unknown-sgx
-    - TARGET=x86_64-unknown-linux-gnu ZLIB_INSTALLED=true AES_NI_SUPPORT=true
   global:
     - RUST_BACKTRACE=1
     # Pinned to this particular nightly version because of core_io. This can be
     # re-pinned whenever core_io is updated to the latest nightly.
     - CORE_IO_NIGHTLY=nightly-2021-03-25
     - LLVM_CONFIG_PATH=llvm-config-3.9
-
-before_script:
-  - if [ "$TARGET" == "aarch64-unknown-linux-musl" ]; then
-      cd /tmp && wget https://musl.cc/aarch64-linux-musl-cross.tgz;
-      tar -xvzf aarch64-linux-musl-cross.tgz;
-      cd $TRAVIS_BUILD_DIR;
-    fi
-
+jobs:
+  include:
+    # Test additional Rust toolchains on x86_64
+    - rust: beta
+    - rust: nightly
+    - rust: nightly-2021-03-25
 script:
   - ./ct.sh

ct.sh

@@ -9,6 +9,12 @@ if [ -z $TRAVIS_RUST_VERSION ]; then
     exit 1
 fi
 
+if [ "$TARGET" == "aarch64-unknown-linux-musl" ]; then
+  cd /tmp && wget https://musl.cc/aarch64-linux-musl-cross.tgz;
+  tar -xzf aarch64-linux-musl-cross.tgz;
+  cd $TRAVIS_BUILD_DIR;
+fi
+
 export CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
 export CC_x86_64_fortanix_unknown_sgx=clang-11
 export CC_aarch64_unknown_linux_musl=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
@@ -32,12 +38,12 @@ if [ "$TRAVIS_RUST_VERSION" == "stable" ] || [ "$TRAVIS_RUST_VERSION" == "beta"
         cargo test --features dsa --target $TARGET
 
         # If zlib is installed, test the zlib feature
-        if [[ -v "${ZLIB_INSTALLED}" ]]; then
+        if [ -n $ZLIB_INSTALLED ]; then
             cargo test --features zlib --target $TARGET
         fi
 
         # If AES-NI is supported, test the feature
-        if [[ -v "${AES_NI_SUPPORT}" ]]; then
+        if [ -n $AES_NI_SUPPORT ]; then
             cargo test --features force_aesni_support --target $TARGET
         fi
     else