[commit: packages/haskeline] master: Simplify and speed up the Travis CI. (#95) (1067a3d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/1067a3d0e4766072d4dab31ac4131d2ed811c801

>---------------------------------------------------------------

commit 1067a3d0e4766072d4dab31ac4131d2ed811c801
Author: Judah Jacobson <judah at users.noreply.github.com>
Date:   Sat Oct 6 06:21:56 2018 -0700

    Simplify and speed up the Travis CI. (#95)
    
    - Use Travis's build-in apt support
    - Use `language: c` explicitly
    - Remove unnecessary `cabal` invocations
    - Remove the separate `before_install` step


>---------------------------------------------------------------

1067a3d0e4766072d4dab31ac4131d2ed811c801
 .travis.yml | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bbfc7d..e8ca54d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,27 @@
-# Based on https://github.com/hvr/multi-ghc-travis
-#
-# NB: don't set `language: haskell` here
-env:
- - CABALVER=1.24 GHCVER=8.0.1
- - CABALVER=1.24 GHCVER=8.0.2
- - CABALVER=2.0 GHCVER=8.2.2
- - CABALVER=2.2 GHCVER=8.4.3
- - CABALVER=2.4 GHCVER=8.6.1
+# Use a lightweight base image; we provide our own build tools.
+language: c
 
-# Note: the distinction between `before_install` and `install` is not important.
-before_install:
- - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
- - travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
- - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+matrix:
+  include:
+  - env: CABALVER=1.24 GHCVER=8.0.1
+    addons: {apt: {packages: [cabal-install-1.24, ghc-8.0.1], sources: [hvr-ghc]}}
+  - env: CABALVER=1.24 GHCVER=8.0.2
+    addons: {apt: {packages: [cabal-install-1.24, ghc-8.0.2], sources: [hvr-ghc]}}
+  - env: CABALVER=2.0 GHCVER=8.2.2
+    addons: {apt: {packages: [cabal-install-2.0, ghc-8.2.2], sources: [hvr-ghc]}}
+  - env: CABALVER=2.2 GHCVER=8.4.3
+    addons: {apt: {packages: [cabal-install-2.2, ghc-8.4.3], sources: [hvr-ghc]}}
+  - env: CABALVER=2.4 GHCVER=8.6.1
+    addons: {apt: {packages: [cabal-install-2.4, ghc-8.6.1], sources: [hvr-ghc]}}
 
 install:
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - travis_retry cabal update
  - cabal install --only-dependencies
 
-# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail.
 script:
- - if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal --version
  - cabal configure -v2  # -v2 provides useful information for debugging
  - cabal build   # this builds all libraries and executables (including tests/benchmarks)
  - cabal check