Travis-CI:

* don't constrain to precise
 * add libxrandr dependency
 * test against new GHC versions
 * install xmonad from git before cabal can install it from hackage
This commit is contained in:
L. S. Leary
2018-07-21 22:12:59 +12:00
parent 4f23016e54
commit 259c170ac9
2 changed files with 36 additions and 19 deletions

View File

@@ -1,7 +1,6 @@
# This file has been generated -- see https://github.com/hvr/multi-ghc-travis # This file has been generated -- see https://github.com/hvr/multi-ghc-travis
language: c language: c
sudo: false sudo: false
dist: precise
cache: cache:
directories: directories:
@@ -14,27 +13,42 @@ before_cache:
matrix: matrix:
include: include:
- env: CABALVER=1.16 GHCVER=7.6.3 - env: GHCVER=8.4.3 CABALVER=2.2
compiler: ": #GHC 7.6.3" compiler: ": #GHC 8.4.3"
addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}} addons: { apt: { packages: [cabal-install-2.2, ghc-8.4.3, libxrandr-dev]
- env: CABALVER=1.18 GHCVER=7.8.4 , sources: [hvr-ghc]
compiler: ": #GHC 7.8.4" } }
addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}} - env: GHCVER=8.2.2 CABALVER=2.0
- env: CABALVER=1.22 GHCVER=7.10.3 compiler: ": #GHC 8.2.2"
compiler: ": #GHC 7.10.3" addons: { apt: { packages: [cabal-install-2.0, ghc-8.2.2, libxrandr-dev]
addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}} , sources: [hvr-ghc]
- env: CABALVER=1.24 GHCVER=8.0.1 } }
- env: GHCVER=8.0.1 CABALVER=1.24
compiler: ": #GHC 8.0.1" compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}} addons: { apt: { packages: [cabal-install-1.24, ghc-8.0.1, libxrandr-dev]
, sources: [hvr-ghc]
} }
- env: GHCVER=7.10.3 CABALVER=1.22
compiler: ": #GHC 7.10.3"
addons: { apt: { packages: [cabal-install-1.22, ghc-7.10.3, libxrandr-dev]
, sources: [hvr-ghc]
} }
- env: GHCVER=7.8.4 CABALVER=1.18
compiler: ": #GHC 7.8.4"
addons: { apt: { packages: [cabal-install-1.18, ghc-7.8.4, libxrandr-dev]
, sources: [hvr-ghc]
} }
- env: GHCVER=7.6.3 CABALVER=1.16
compiler: ": #GHC 7.6.3"
addons: { apt: { packages: [cabal-install-1.16, ghc-7.6.3, libxrandr-dev]
, sources: [hvr-ghc]
} }
before_install: before_install:
- unset CC - unset CC
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
install: install:
# build xmonad from HEAD
- git clone https://github.com/xmonad/xmonad.git
- cabal --version - cabal --version
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]" - 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 ]; - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
@@ -43,6 +57,11 @@ install:
$HOME/.cabal/packages/hackage.haskell.org/00-index.tar; $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
fi fi
- travis_retry cabal update -v - travis_retry cabal update -v
# build xmonad from HEAD
- git clone https://github.com/xmonad/xmonad.git
- cabal install xmonad/
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
- sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
@@ -58,8 +77,8 @@ install:
echo "cabal build-cache MISS"; echo "cabal build-cache MISS";
rm -rf $HOME/.cabsnap; rm -rf $HOME/.cabsnap;
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin; mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
cabal install --only-dependencies --enable-tests --enable-benchmarks;
fi fi
- cabal install --only-dependencies --enable-tests --enable-benchmarks;
# snapshot package-db on cache miss # snapshot package-db on cache miss
- if [ ! -d $HOME/.cabsnap ]; - if [ ! -d $HOME/.cabsnap ];
@@ -70,8 +89,6 @@ install:
cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/; cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
fi fi
- cabal install xmonad/
# Here starts the actual work to be performed for the package under test; # 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. # any command which exits with a non-zero exit code causes the build to fail.
script: script:

View File

@@ -36,7 +36,7 @@ cabal-version: >= 1.6
build-type: Simple build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues bug-reports: https://github.com/xmonad/xmonad-contrib/issues
tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.3
source-repository head source-repository head
type: git type: git