From f0a139aae932ca193df49c433250d30a0ad47d71 Mon Sep 17 00:00:00 2001
From: Arya Irani <arya.irani@gmail.com>
Date: Wed, 17 Jun 2020 10:53:57 -0400
Subject: [PATCH 1/2] add multiple ubuntu and osx build images

---
 .travis.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c1d3b8810b..5a6031d4a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,17 @@
 # https://docs.haskellstack.org/en/stable/travis_ci/
-# run on containerized infrastructure hopefully
-dist: trusty
-sudo: false
+jobs:
+  include:
+    - os: linux
+      dist: xenial
+    - os: linux
+      dist: trusty
+    - os: linux
+      dist: bionic
+    - os: osx
+      osx_image: xcode11.6
+    - os: osx
+      osx_image: xcode11.3
+
 language: generic
 
 # Caching so the next build will be fast too.
@@ -16,7 +26,7 @@ before_install:
 # Download and unpack the stack executable
 - mkdir -p ~/.local/bin
 - export PATH=$HOME/.local/bin:$PATH
-- travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+- travis_retry curl -sSL https://get.haskellstack.org/ | sh
 
 install:
 - stack ghc -- --version

From e7cd33af5f21884ecb2ccaee645a80e0f52b7757 Mon Sep 17 00:00:00 2001
From: Arya Irani <arya.irani@gmail.com>
Date: Thu, 18 Jun 2020 14:16:48 -0400
Subject: [PATCH 2/2] uncache ~/.stack/setup-exe-cache due to travis caching
 bug?

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5a6031d4a7..633d8347eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,10 @@ cache:
   directories:
   - $HOME/.stack
 
-before_cache:
 # Do any cleanup here to avoid caching junk.
+before_cache:
+  # this was getting corrupted in the cache for osx ??
+  - rm -rf /Users/travis/.stack/setup-exe-cache
 
 before_install:
 # Download and unpack the stack executable