From 70275251515d6320c7d2d8aedf34f30e077928fe Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 28 Jun 2018 13:32:53 +0200
Subject: [PATCH] travis: remove redundant build, use cabal 2.2 with ghc 8.4.
---
.travis.yml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 152a597fb..f80880426 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,13 +45,9 @@ matrix:
compiler: ": #GHC 8.2.2"
addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5], sources: [hvr-ghc]}}
- - env: BUILD=cabal GHCVER=8.2.2 CABALVER=2.0 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks"
- compiler: ": #GHC 8.2.2"
- addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2,happy-1.19.5], sources: [hvr-ghc]}}
-
- - env: BUILD=cabal GHCVER=8.4.1 CABALVER=2.0 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks"
+ - env: BUILD=cabal GHCVER=8.4.1 CABALVER=2.2 OPTS="-O0 -Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" FLAGS="fast embed_data_files" CABALARGS="--enable-benchmarks"
compiler: ": #GHC 8.4.1"
- addons: {apt: {packages: [cabal-install-2.0,ghc-8.4.1,happy-1.19.5], sources: [hvr-ghc]}}
+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.1,happy-1.19.5], sources: [hvr-ghc]}}
# Build with the newest GHC and cabal-install. This is an accepted failure,
# see below.