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
---
 .gitignore          |  4 ++++
 .travis.yml         | 18 ++++++++++++++++--
 appveyor.yml        |  2 +-
 ci/before_deploy.sh |  1 -
 ci/install.sh       |  4 ++++
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea8c4bf..8d0e9ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+.cargo
 /target
+**/target
+Cargo.lock
+**/Cargo.lock
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:
diff --git a/appveyor.yml b/appveyor.yml
index 3cadeff..1725494 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@ environment:
   global:
     # This will be used as part of the zipfile name
     PROJECT_NAME: ilc
-    RUST_VERSION: nightly
+    RUST_VERSION: 1.6.0
   matrix:
     - TARGET: i686-pc-windows-gnu
       MSYS2_BITS: 32
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
index 233ae9e..6493f96 100644
--- a/ci/before_deploy.sh
+++ b/ci/before_deploy.sh
@@ -5,7 +5,6 @@ set -ex
 # create a "staging" directory
 mkdir staging
 
-# TODO update this part to copy the artifacts that make sense for your project
 # NOTE All Cargo build artifacts will be under the 'target/$TARGET/{debug,release}'
 cp target/$TARGET/release/ilc* staging
 
diff --git a/ci/install.sh b/ci/install.sh
index 81ff38c..e4bd198 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -24,6 +24,10 @@ EOF
     # doesn't work for nightly
     # version=$(rustc -V | cut -d' ' -f2)
     version=$(rustc -V | cut -d' ' -f2 | cut -d'-' -f2)
+
+    if [ "$TARGET" = "x86_64-unknown-linux-musl" ]; then
+        version="nightly"
+    fi
     tarball=rust-std-${version}-${TARGET}
 
     curl -Os http://static.rust-lang.org/dist/${tarball}.tar.gz
-- 
cgit v1.2.3