From dec97b59468d6c7dcdd704a6d53df4cfc257f72d Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Wed, 28 Jun 2017 08:14:25 -0600
Subject: [PATCH 1/5] Install a default rust toolchain before testing in Travis

Cross crashes if there isn't a default toolchain installed, even if it's
not the toolchain we intend to use.

Fixes #634
---
 ci/script.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/script.sh b/ci/script.sh
index df61c35a6c..5e2e1da5f3 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -9,6 +9,7 @@ main() {
     fi
 
     # Build debug and release targets
+    rustup default 1.13.0-$TARGET
     cross build --target $TARGET
     cross build --target $TARGET --release
 

From 4d9d2a7f8375859d18ff1a20d56d76590f2b5370 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Wed, 28 Jun 2017 08:55:47 -0600
Subject: [PATCH 2/5] Perhaps cross needs the default toolchain to be stable?

---
 ci/script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/script.sh b/ci/script.sh
index 5e2e1da5f3..6ecbec639f 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -9,7 +9,7 @@ main() {
     fi
 
     # Build debug and release targets
-    rustup default 1.13.0-$TARGET
+    rustup default stable-$TARGET
     cross build --target $TARGET
     cross build --target $TARGET --release
 

From ef9ef4f0c94c1bd64b5bd805d9041d871618adcc Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Wed, 28 Jun 2017 16:22:34 -0600
Subject: [PATCH 3/5] Try using Travis' older images, pre 21-June

---
 .travis.yml  | 1 +
 ci/script.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3c63f12a76..456e1e45ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ dist: trusty
 language: rust
 services: docker
 sudo: required
+group: deprecated-2017Q2
 
 env:
   global:
diff --git a/ci/script.sh b/ci/script.sh
index 6ecbec639f..b28c74e693 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -9,7 +9,7 @@ main() {
     fi
 
     # Build debug and release targets
-    rustup default stable-$TARGET
+    #rustup default stable-$TARGET
     cross build --target $TARGET
     cross build --target $TARGET --release
 

From 154973cd7dc5762e624a78392289d55fe33e59d6 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Fri, 30 Jun 2017 18:35:48 -0600
Subject: [PATCH 4/5] Try Travis's sudo-less image.

Travis uses different VM images depending on whether sudo is required.
AFAICT, nothing in either nix or cross actually requires sudo.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 456e1e45ee..39e0a5afea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@
 dist: trusty
 language: rust
 services: docker
-sudo: required
-group: deprecated-2017Q2
+sudo: false
 
 env:
   global:

From 46009285bd182d2894842bcad591dabc38eb0a31 Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Fri, 30 Jun 2017 21:14:07 -0600
Subject: [PATCH 5/5] Disable casher.

I can't run it locally, making it one of the few differences between
Travis and my local system.  Also, disable a redundant modification to
PATH.  Travis already does it.
---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39e0a5afea..ad986dbf72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,6 @@ before_install: set -e
 
 install:
   - sh ci/install.sh
-  - source ~/.cargo/env || true
 
 script:
   - bash ci/script.sh
@@ -120,10 +119,10 @@ deploy:
   provider: releases
   skip_cleanup: true
 
-cache: cargo
-before_cache:
+#cache: cargo
+#before_cache:
   # Travis can't cache files that are not readable by "others"
-  - chmod -R a+r $HOME/.cargo
+  #- chmod -R a+r $HOME/.cargo
 
 branches:
   only: