From f49ed2e71a11023b09556f0fdf58abab90a675d8 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 1 Oct 2016 21:12:01 +0200
Subject: Removed cabal 1.16 cruft from .travis.yml.

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 37ea4fbb3..b9f3163a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,13 +111,11 @@ script:
     cabal)
       cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror"
       cabal build
-      cabal check || [ "$CABALVER" == "1.16" ]
+      cabal check
       cabal test
       cabal copy
-      # cabal sdist fails on cabal 1.16:
-      cabal sdist || [ "$CABALVER" == "1.16" ]
+      cabal sdist
       SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && \
-        (cd dist && cabal install --enable-tests --force-reinstalls "$SRC_TGZ" || \
-            [ "$CABALVER" == "1.16" ])
+        (cd dist && cabal install --enable-tests --force-reinstalls "$SRC_TGZ")
       ;;
   esac
-- 
cgit v1.2.3