From fefe8e0219799730bd6ceb3923f0448317102dbd Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 23 Jul 2017 09:34:15 +0300
Subject: [PATCH] Attempt to get Travis building again

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

diff --git a/.travis.yml b/.travis.yml
index ee1a40b9..480d440f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,6 +119,8 @@ matrix:
   allow_failures:
   - env: BUILD=cabal GHCVER=head  CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
   - env: BUILD=stack ARGS="--resolver nightly"
+  - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
+  - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
 
 before_install:
 # Using compiler above sets CC to an invalid value, so unset it
@@ -171,9 +173,15 @@ script:
         # Build dependencies with -O0 as well
         echo "apply-ghc-options: everything" >> stack.yaml
 
+        # Avoid OOM for building Cabal
+        stack --install-ghc --no-terminal $ARGS build Cabal --fast
+
         # Use slightly less intensive options on OS X due to Travis timeouts
         stack --install-ghc --no-terminal $ARGS test --fast
       else
+        # Avoid OOM for building Cabal
+        stack --install-ghc --no-terminal $ARGS build Cabal --fast
+
         stack --install-ghc --no-terminal $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps --pedantic
       fi
       ;;