From b082a83cafc872ea19d9792644c012b5f9b13974 Mon Sep 17 00:00:00 2001
From: Till Höppner
Date: Thu, 25 Feb 2016 19:19:57 +0100
Subject: Switch CI from nightly to 1.6

Switch to old version detection
---
 .travis.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 24688a5..7ed3db1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,10 @@ sudo: false
 
 language: rust
 
-rust: nightly
+rust:
+  - stable
+  - beta
+  - nightly
 
 os:
   - linux
@@ -15,13 +18,18 @@ env:
 
 matrix:
   allow_failures:
-    - rust: stable
     - rust: beta
+    - rust: nightly
+    - os: osx
 
   # Clear the whole matrix
   exclude:
     - os: linux
     - os: osx
+    - rust: stable
+    - rust: beta
+    - rust: nightly
+
   # Add each target manually
   # pattern shown below
   include:
@@ -29,6 +37,7 @@ matrix:
     # may have problems when too many threads are spawned. Also, by the next Rust stable release,
     # this target will be replaced by `armv7-unknown-linux-gnueabihf`.
     - os: linux
+      rust: stable
       env: TARGET=arm-unknown-linux-gnueabihf
       # Extra packages only for this build job
       addons:
@@ -41,6 +50,7 @@ matrix:
             # Emulator
             - qemu-user
     - os: linux
+      rust: stable
       env: TARGET=i686-unknown-linux-gnu
       addons:
         apt:
@@ -48,12 +58,16 @@ matrix:
             # Cross compiler and cross compiled C libraries
             - gcc-multilib
     - os: linux
+      rust: stable
       env: TARGET=x86_64-unknown-linux-gnu
     - os: linux
+      rust: nightly
       env: TARGET=x86_64-unknown-linux-musl
     - os: osx
+      rust: stable
       env: TARGET=i686-apple-darwin
     - os: osx
+      rust: stable
       env: TARGET=x86_64-apple-darwin
 
 install:
-- 
cgit v1.2.3