From 549fb0fb922ee3086af2d35a125aabf725875c2d Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 2 Jun 2015 14:56:42 +0100 Subject: [PATCH 1/3] [travis] try to use containers base infrastructure --- .travis.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56328f2..d26dfa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: false + env: - CABALVER=1.16 GHCVER=7.0.4 - CABALVER=1.16 GHCVER=7.4.2 @@ -10,10 +12,22 @@ matrix: allow_failures: - env: CABALVER=head GHCVER=head +addons: + apt: + sources: + - hvr-ghc + packages: + - cabal-install-1.18 + - cabal-install-1.20 + - cabal-install-1.22 + - ghc-7.0.4 + - ghc-7.4.2 + - ghc-7.6.3 + - ghc-7.8.4 + - ghc-7.10.1 + - ghc-head + 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 # see note about happy/alex - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH install: From c02012552c4b1d6e1cdf4085afbd337588596d05 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 2 Jun 2015 17:11:17 +0100 Subject: [PATCH 2/3] [travis] fixing some missing compilers/cabal versions --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d26dfa0..a70e33a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ env: - CABALVER=1.16 GHCVER=7.0.4 - CABALVER=1.16 GHCVER=7.4.2 - CABALVER=1.18 GHCVER=7.6.3 - - CABALVER=1.18 GHCVER=7.8.3 + - CABALVER=1.18 GHCVER=7.8.4 - CABALVER=1.22 GHCVER=7.10.1 - CABALVER=head GHCVER=head @@ -17,9 +17,11 @@ addons: sources: - hvr-ghc packages: + - cabal-install-1.16 - cabal-install-1.18 - cabal-install-1.20 - cabal-install-1.22 + - cabal-install-head - ghc-7.0.4 - ghc-7.4.2 - ghc-7.6.3 From d8b72f5f86849101152a0eea3741103bbf0b5be3 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Wed, 3 Jun 2015 11:24:00 +0100 Subject: [PATCH 3/3] remove multilines --- .travis.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index a70e33a..81ae275 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,22 +36,12 @@ install: - cabal --version - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - travis_retry cabal update - - if [ "${GHCVER}" = "7.0.4" ]; then - cabal install --only-dependencies; - else - cabal install --only-dependencies --enable-tests; - fi + - if [ "${GHCVER}" = "7.0.4" ]; then cabal install --only-dependencies; else cabal install --only-dependencies --enable-tests; fi script: - - if [ "${GHCVER}" != "7.0.4" ]; then - cabal configure --enable-tests -v2; - else - cabal configure -v2; - fi + - if [ "${GHCVER}" != "7.0.4" ]; then cabal configure --enable-tests -v2; else cabal configure -v2; fi - cabal build - - if [ "${GHCVER}" != "7.0.4" ]; then - cabal test; - fi; + - if [ "${GHCVER}" != "7.0.4" ]; then cabal test; fi; - cabal check - cabal sdist - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;