Merge pull request #158 from phadej/lts-4

Add lts-4.0 matrix rows

Author: phadej

.travis.yml

@@ -24,23 +24,29 @@ matrix:
  - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4 STACKAGESNAPSHOT=lts-2.22
  compiler: ": #GHC 7.8.4 lts-2.22"
  addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
- - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.2
- compiler: ": #GHC 7.10.2"
+ - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.2 STACKAGESNAPSHOT=lts-3.21
+ compiler: ": #GHC 7.10.2 lts-3.21"
  addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
- - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.2 STACKAGESNAPSHOT=lts-3
- compiler: ": #GHC 7.10.2 lts-3"
- addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
- - env: BUILD=stack STACK_YAML=stack-lts-2.yaml
+ - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3
+ compiler: ": #GHC 7.10.3"
+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+ - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3 STACKAGESNAPSHOT=lts-4.0
+ compiler: ": #GHC 7.10.3 lts-4.0"
+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
+ - env: BUILD=stack STACK_YAML=stack-lts-2.yaml GHCVER=7.8.4
  compiler: ": #STACK LTS2"
  addons: {apt: {packages: [ghc-7.8.4], sources: [hvr-ghc]}}
- - env: BUILD=stack STACK_YAML=stack-lts-3.yaml
+ - env: BUILD=stack STACK_YAML=stack-lts-3.yaml GHCVER=7.10.2
  compiler: ": #STACK LTS3"
  addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
- - env: BUILD=stack STACK_YAML=stack-nightly.yaml
+ - env: BUILD=stack STACK_YAML=stack-lts-4.yaml GHCVER=7.10.3
+ compiler: ": #STACK LTS4"
+ addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
+ - env: BUILD=stack STACK_YAML=stack-nightly.yaml GHCVER=7.10.3
  compiler: ": #STACK nightly"
  addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
- - env: BUILD=stack STACK_YAML=stack-lts-3.yaml
- compiler: ": #stack LTS3 OSX"
+ - env: BUILD=stack STACK_YAML=stack-lts-4.yaml
+ compiler: ": #stack LTS4 OSX"
  os: osx
 
 before_install:

stack-lts-3.yaml

@@ -2,7 +2,7 @@ packages:
 - '.'
 extra-deps:
 - http-link-header-1.0.1
-resolver: lts-3.20
+resolver: lts-3.21
 flags:
  github:
  aeson-compat: false

stack-lts-4.yaml

@@ -0,0 +1,7 @@
+packages:
+- '.'
+extra-deps: []
+resolver: lts-4.0
+flags:
+ github:
+ aeson-compat: true

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2016-01-03
+resolver: nightly-2016-01-08
 packages:
 - '.'
 extra-deps: []

travis-install.sh

@@ -16,7 +16,7 @@ case $BUILD in
  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
+ 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