From 9931a5781cc308eb6724095cab480bb4aabfff19 Mon Sep 17 00:00:00 2001 From: Colin Woodbury Date: Wed, 22 Jul 2015 05:25:40 -0700 Subject: [PATCH] _Actually_ fix the TravisCI builds --- .travis.yml | 33 +++++++++++++++++++++++++++++++-- aura.cabal | 6 +++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a3892bfe..668f01ca6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,31 @@ -language: haskell -ghc: 7.10 +# From https://github.com/hvr/multi-ghc-travis (thank you) + +language: c + +env: + - CABALVER=1.22 GHCVER=7.10.1 + +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 + +install: + - cabal --version + - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" + - travis_retry cabal update + - cabal install --only-dependencies --enable-tests --enable-benchmarks + +script: + - if [ -f configure.ac ]; then autoreconf -i; fi + # -v2 provides useful information for debugging + - cabal configure --enable-tests --enable-benchmarks -v2 + - cabal build + - cabal test + - cabal check + - cabal sdist + + # check that the generated source-distribution can be built & installed + - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && + (cd dist && cabal install --force-reinstalls "$SRC_TGZ") diff --git a/aura.cabal b/aura.cabal index 9c3b3f3db..e00b967e0 100644 --- a/aura.cabal +++ b/aura.cabal @@ -1,6 +1,6 @@ name: aura -version: 1.3.1.0 +version: 1.3.2.0 synopsis: A secure package manager for Arch Linux and the AUR, written in Haskell. @@ -84,13 +84,13 @@ executable aura Bash.Parser, Bash.Simplify - build-depends: aur, + build-depends: aur>=3.0.0, mtl, lens, text, time, unix, - wreq-sb, + wreq, split, array, parsec,