From 80d9a6371db5801f106e1c90b6ffe59aecf463e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pedro=20C=C3=B4rte-Real?= <pedro@pedrocr.net>
Date: Sun, 8 Oct 2017 14:51:55 +0100
Subject: [PATCH] Use travis matrix for the ios/linux variants (#313)

---
 .travis.yml | 66 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51fdd7be..370cb8ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,57 @@
 language: rust
 
-rust:
-  - nightly
-  - stable
-
 cache: cargo
 
+matrix:
+  include:
+    # Linux 32bit
+    - env: TARGET=i686-unknown-linux-gnu
+      os: linux
+      rust: nightly
+      addons:
+        apt:
+          # Cross compiler and cross compiled C libraries
+          packages: &i686_packages
+            - gcc-multilib
+    - env: TARGET=i686-unknown-linux-gnu
+      os: linux
+      rust: stable
+      addons:
+        apt:
+          packages: *i686_packages
+
+    # Linux 64bit
+    - env: TARGET=x86_64-unknown-linux-gnu
+      os: linux
+      rust: nightly
+    - env: TARGET=x86_64-unknown-linux-gnu
+      os: linux
+      rust: stable
+
+    # macOS
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: stable
+
+    # iOS
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: nightly
+    - env: TARGET=x86_64-apple-ios
+      os: osx
+      rust: stable
+
 install:
   - rustup self update
-  - |
-      if [ $TRAVIS_OS_NAME = osx ]; then
-        rustup target add x86_64-apple-ios
-      fi
-  - |
-      if [ $TRAVIS_OS_NAME = linux ]; then
-        rustup target add i686-unknown-linux-gnu
-      fi
+  - rustup target add $TARGET; true
 
 script:
-  - cargo build --verbose
-  - if [ $TRAVIS_OS_NAME = osx ]; then cargo build --target x86_64-apple-ios --verbose; fi
-  - if [ $TRAVIS_OS_NAME = linux ]; then cargo build --target i686-unknown-linux-gnu --verbose; fi
-  - cargo test --verbose
-
-os:
-  - linux
-  - osx
+  - cargo build --target $TARGET --verbose
+  # Running iOS apps on OSX requires the simulator so we skip that for now
+  - if [ "$TARGET" != "x86_64-apple-ios" ]; then cargo test --target $TARGET --verbose; fi
 
 after_success:
   - |