Improve travis code

japaric · May 6, 2017 · ca5aaef · ca5aaef
1 parent 36956ee
commit ca5aaef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,13 +9,13 @@ env:       TARGET=x86_64-unknown-linux-gnu
 matrix:
   include:
     - env: TARGET=i686-unknown-linux-gnu
-    - env: TARGET=x86_64-unknown-linux-gnu RUST_BETA=1
+    - env: TARGET=x86_64-unknown-linux-gnu
       rust: beta
-    - env: TARGET=i686-unknown-linux-gnu RUST_BETA=1
+    - env: TARGET=i686-unknown-linux-gnu
       rust: beta
-    - env: TARGET=x86_64-unknown-linux-gnu RUST_NIGHTLY=1
+    - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
-    - env: TARGET=i686-unknown-linux-gnu RUST_NIGHTLY=1
+    - env: TARGET=i686-unknown-linux-gnu
       rust: nightly
 
 before_install: set -e

diff --git a/ci/script.sh b/ci/script.sh
@@ -4,8 +4,8 @@ main() {
     cross test --target $TARGET
     cross test --target $TARGET --release
 
-    [ -z "$RUST_NIGHTLY" ] || cross test --feature x128 --target $TARGET
-    [ -z "$RUST_NIGHTLY" ] || cross test --feature x128 --target $TARGET --release
+    [ "$TRAVIS_RUST_VERSION" -eq "nightly" ] && cross test --feature x128 --target $TARGET
+    [ "$TRAVIS_RUST_VERSION" -eq "nightly" ] && cross test --feature x128 --target $TARGET --release
 
     cross test --no-default-features --target $TARGET
     cross test --no-default-features --target $TARGET --release