Auto merge of #322 - posborne:travis-mixed-sudo-environment, r=kamalmarhubi

travis: only require sudo on docker/i686 builds

Signed-off-by: Paul Osborne <osbpau@gmail.com>

Author: homu

.travis.yml

@@ -1,11 +1,16 @@
 language: rust
-sudo: required
+sudo: false
 dist: trusty
 services:
   - docker
 
 rust:
   - 1.1.0  # Oldest supported version
+  - 1.2.0
+  - 1.3.0
+  - 1.4.0
+  - 1.5.0
+  - 1.6.0
   - stable
   - beta
   - nightly
@@ -15,36 +20,54 @@ script:
 
 env:
   - ARCH=x86_64
+  - ARCH=i686
 
 os:
   - linux
-  - osx
+
+addons:
+  apt:
+    packages:
+      - gcc-multilib
 
 # Failures on nightly shouldn't fail the overall build.
 matrix:
   fast_finish: true
   include:
-    - os: linux
-      env: ARCH=i686
+    # 32-bit and 64-bit OSX builds on oldest/stable
+    - os: osx
+      env: ARCH=x86_64
       rust: stable
     - os: osx
       env: ARCH=i686
       rust: stable
+    - os: osx
+      env: ARCH=x86_64
+      rust: 1.1.0
+    - os: osx
+      env: ARCH=i686
+      rust: 1.1.0
+    # Docker builds for other targets
     - os: linux
       env: TARGET=aarch64-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:arm
       rust: 1.7.0
+      sudo: true
     - os: linux
       env: TARGET=arm-unknown-linux-gnueabihf DOCKER_IMAGE=posborne/rust-cross:arm
       rust: 1.7.0
+      sudo: true
     - os: linux
       env: TARGET=mips-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
       rust: 1.7.0
+      sudo: true
     - os: linux
       env: TARGET=mipsel-unknwon-linux-gnu DOCKER_IMAGE=posborne/rust-cross:mips
       rust: 1.7.0
+      sudo: true
     - os: linux
       env: TARGET=arm-linux-androideabi DOCKER_IMAGE=posborne/rust-cross:android
       rust: 1.7.0
+      sudo: true
   allow_failures:
     - rust: nightly
     - env: TARGET=aarch64-unknown-linux-gnu DOCKER_IMAGE=posborne/rust-cross:arm

ci/run-travis.sh

@@ -30,11 +30,6 @@ if [ "$TARGET" = "" ]; then
   TARGET=$HOST
 fi
 
-if [ "$TARGET" = "i686-unknown-linux-gnu" ]; then
-    sudo apt-get -y update
-    sudo apt-get install -y gcc-multilib
-fi
-
 if [ "$DOCKER_IMAGE" = "" ]; then
   export RUST_TEST_THREADS=1
   curl -sSL "https://raw.githubusercontent.com/carllerche/travis-rust-matrix/master/test" | bash