Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Travis: Tweak the cabal/apt install script

  • Loading branch information...
commit 929c7d696f639e2f4944f0436e92364db8942162 1 parent 1c24de3
@ion1 ion1 authored
View
6 .travis.yml
@@ -6,11 +6,7 @@ before_install:
# - cabal update
# Try installing some of the build-deps with apt-get for speed.
- - ./travis-tests
- - cabal install --only-dependencies --enable-tests
-
- # - ./travis-benchmarks
- # - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstall
+ - ./travis-cabal-apt-install --only-dependencies --enable-tests
install:
# we have to configure rather than install in order to get benchmarks
View
6 travis-benchmarks → travis-cabal-apt-install
@@ -4,9 +4,13 @@ set -eu
sudo apt-get -q update
sudo apt-get -q -y install dctrl-tools
+# Try installing some of the build-deps with apt-get for speed.
eval "$(
printf '%s' "grep-aptavail -n -sPackage '(' -FFALSE -X FALSE ')'"
- 2>/dev/null cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstall --dry-run -v | \
+ 2>/dev/null cabal install "$@" --dry-run -v | \
sed -nre "s/^([^ ]+)-[0-9.]+ \(.*$/ -o '(' -FPackage -X libghc-\1-dev ')'/p" | \
xargs -d'\n'
)" | sort -u | xargs -d'\n' sudo apt-get -q -y install -- libghc-quickcheck2-dev
+
+# Install whatever is still needed with cabal.
+cabal install "$@"
View
12 travis-tests
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -eu
-
-sudo apt-get -q update
-sudo apt-get -q -y install dctrl-tools
-
-eval "$(
- printf '%s' "grep-aptavail -n -sPackage '(' -FFALSE -X FALSE ')'"
- 2>/dev/null cabal install --only-dependencies --enable-tests --dry-run -v | \
- sed -nre "s/^([^ ]+)-[0-9.]+ \(.*$/ -o '(' -FPackage -X libghc-\1-dev ')'/p" | \
- xargs -d'\n'
-)" | sort -u | xargs -d'\n' sudo apt-get -q -y install -- libghc-quickcheck2-dev
Please sign in to comment.
Something went wrong with that request. Please try again.