From 6bdc03a37750bbf929f4be151db0d027b7fac186 Mon Sep 17 00:00:00 2001
From: John Colvin <john.loughran.colvin@gmail.com>
Date: Mon, 26 Jun 2017 15:54:27 +0100
Subject: [PATCH 1/4] test different compilers

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21aca54d..35e18257 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ d:
   - dmd-beta
   - ldc
   - ldc-beta
-  - gdc-6.3.0
 
 env:
   - ARCH=x86_64 CONFIG=default
@@ -30,8 +29,6 @@ matrix:
       env: ARCH=x86 CONFIG=x11
     - os: osx
       env: ARCH=x86_64 CONFIG=x11
-    - os: osx
-      d: gdc-6.3.0
 
 sudo: true
 before_script:

From cbcd0f87797d2c9ba4ac4b0ad9b32e8f61f241eb Mon Sep 17 00:00:00 2001
From: John Colvin <john.loughran.colvin@gmail.com>
Date: Mon, 26 Jun 2017 16:27:10 +0100
Subject: [PATCH 2/4] use travis apt addon

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35e18257..61fa5205 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,11 +30,12 @@ matrix:
     - os: osx
       env: ARCH=x86_64 CONFIG=x11
 
-sudo: true
-before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$ARCH" == "x86" ]]; then sudo apt-get install gcc-multilib; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CONFIG" == "x11" && "$ARCH" == "x86_64" ]]; then sudo apt-get install libx11-dev; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CONFIG" == "x11" && "$ARCH" == "x86" ]]; then sudo apt-get install libx11-dev:i386; fi
+addons:
+  apt:
+    packages:
+      - gcc-multilib
+      - libx11-dev
+      - libx11-dev:i386
 
 script:
   - dub test --compiler=${DC} --arch=${ARCH} --config=${CONFIG}

From 89751d94a70650db2ef7d2335d3d078543aaf1ed Mon Sep 17 00:00:00 2001
From: John Colvin <john.loughran.colvin@gmail.com>
Date: Mon, 26 Jun 2017 16:28:56 +0100
Subject: [PATCH 3/4] travis without sudo

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 61fa5205..be177713 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: false
+
 language: d
 
 os:

From e3d7bd6721fc5de31fca2e9448310984d55fec98 Mon Sep 17 00:00:00 2001
From: John Colvin <john.loughran.colvin@gmail.com>
Date: Mon, 26 Jun 2017 16:39:01 +0100
Subject: [PATCH 4/4] update to testing on trusty

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index be177713..946acd56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 
 language: d