Fix travis.yml

I have no idea why it broke. Maybe the inline comment?

diff --git a/.travis.yml b/.travis.yml
index 365411c1b7c409936dc1b8fdfd53f437f7f0e505..48bbe70d6fc6ff78fcaf4b2aa616acb6ced5bb9d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,70 +34,67 @@ env:
     - secure: "cpcJvp233pVNy05VeWgzUEw1xYCekk1xT1x2grzhUx8mpCqXZda+Xbu76QCqLSESPgc8Q39m6bR8c+oLkbgRM1U+hR91+2sccKaP9cLTad0yoPRdm6qDB96mzLcEX+yl22GVVzSg20AZx0B9edIT9z7pnEVMJV4iDwhsx/p5Uas="
 
 before_install:
- - unset CC
- - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+  - unset CC
+  - export PATH=$HOME/.cabal/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
- - cabal --version
- - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
-   then
-     zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
-          $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
-   fi
- - travis_retry cabal update -v
- - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
- - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
+  - cabal --version
+  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+  - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
+    then
+      zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
+      $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
+    fi
+  - travis_retry cabal update -v
+  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
+  - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
+  - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
 
-# check whether current requested install-plan matches cached package-db snapshot
- - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
-   then
-     echo "cabal build-cache HIT";
-     rm -rfv .ghc;
-     cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
-     cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
-   else
-     echo "cabal build-cache MISS";
-     rm -rf $HOME/.cabsnap;
-     mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
-     cabal install --only-dependencies --enable-tests --enable-benchmarks;
-   fi
+    # check whether current requested install-plan matches cached package-db snapshot
+  - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
+    then
+      echo "cabal build-cache HIT";
+      rm -rfv .ghc;
+      cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
+      cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
+    else
+      echo "cabal build-cache MISS";
+      rm -rf $HOME/.cabsnap;
+      mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
+      cabal install --only-dependencies --enable-tests --enable-benchmarks;
+    fi
 
-# snapshot package-db on cache miss
- - if [ ! -d $HOME/.cabsnap ];
-   then
+    # snapshot package-db on cache miss
+  - if [ ! -d $HOME/.cabsnap ];
+    then
       echo "snapshotting package-db to build-cache";
       mkdir $HOME/.cabsnap;
       cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
       cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
-   fi
+    fi
 
 # 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 install hpc-coveralls --constraint=retry==0.6
- - if [ "1.18" = $CABALVER ];
-   then
-     cabal configure --enable-tests --enable-benchmarks -v2 --enable-library-coverage  # -v2 provides useful information for debugging
-   else
-     cabal configure --enable-tests --enable-benchmarks -v2 --enable-coverage  # -v2 provides useful information for debugging
-   fi
- - cabal build   # this builds all libraries and executables (including tests/benchmarks)
- - run-cabal-test test
- - cabal bench
- - cabal check
- - cabal sdist   # tests that a source-distribution can be generated
-
-
-# Check that the resulting source distribution can be built & installed.
-# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
-# `cabal install --force-reinstalls dist/*-*.tar.gz`
- - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
-   (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
+  - cabal install hpc-coveralls --constraint=retry==0.6
+  - if [ $CABALVER -eq "1.18" ];
+    then
+      cabal configure --enable-tests --enable-benchmarks -v2 --enable-library-coverage
+    else
+      cabal configure --enable-tests --enable-benchmarks -v2 --enable-coverage
+    fi
+  - cabal build   # this builds all libraries and executables (including tests/benchmarks)
+  - run-cabal-test test
+  - cabal bench
+  - cabal check
+  - cabal sdist   # tests that a source-distribution can be generated
+    # Check that the resulting source distribution can be built & installed.
+    # If there are no other `.tar.gz` files in `dist`, this can be even simpler:
+    # `cabal install --force-reinstalls dist/*-*.tar.gz`
+  - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
+      (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
 
 after_script:
- - if [ true = $PUSH_DOCS ]; then bash ./scripts/pushdoc.sh; fi
- - hpc-coveralls test
+  - if [ true = $PUSH_DOCS ]; then bash ./scripts/pushdoc.sh; fi
+  - hpc-coveralls test
 # EOF