Update README and Travis CI job
authorHerbert Valerio Riedel <hvr@gnu.org>
Fri, 21 Nov 2014 09:40:01 +0000 (10:40 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Fri, 21 Nov 2014 09:40:01 +0000 (10:40 +0100)
.travis.yml
README.md

index 0f14c80..5adb918 100644 (file)
@@ -1,29 +1,37 @@
 env:
- - GHCVER=6.12.3
- - GHCVER=7.0.1
- - GHCVER=7.0.2
- - GHCVER=7.0.3
- - GHCVER=7.0.4
- - GHCVER=7.2.1
- - GHCVER=7.2.2
- - GHCVER=7.4.1
- - GHCVER=7.4.2
- - GHCVER=7.6.1
- - GHCVER=7.6.2
- - GHCVER=7.6.3
+ - CABALVER=1.16 GHCVER=7.0.1
+ - CABALVER=1.16 GHCVER=7.0.2
+ - CABALVER=1.16 GHCVER=7.0.3
+ - CABALVER=1.16 GHCVER=7.0.4
+ - CABALVER=1.16 GHCVER=7.2.1
+ - CABALVER=1.16 GHCVER=7.2.2
+ - CABALVER=1.16 GHCVER=7.4.1
+ - CABALVER=1.16 GHCVER=7.4.2
+ - CABALVER=1.16 GHCVER=7.6.1
+ - CABALVER=1.16 GHCVER=7.6.2
+ - CABALVER=1.16 GHCVER=7.6.3
+ - CABALVER=1.18 GHCVER=7.8.1
+ - CABALVER=1.18 GHCVER=7.8.2
+ - CABALVER=1.18 GHCVER=7.8.3
+ - CABALVER=head GHCVER=head
+
+matrix:
+  allow_failures:
+   - env: CABALVER=head GHCVER=head
 
 before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER
- - export PATH=/opt/ghc/$GHCVER/bin:$PATH
+ - 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
+ - cabal --version
+ - ghc --version
 
 install:
- - cabal-1.18 update
- - ghc --version
+ - travis_retry cabal update
 
 script:
- - cabal-1.18 configure -v2
- - cabal-1.18 build
- - cabal-1.18 check
- - cabal-1.18 sdist
+ - cabal configure -v2
+ - cabal build
+ - cabal check
+ - cabal sdist
index bb5babc..45af17c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-The `old-locale` Package  [![Build Status](https://travis-ci.org/ghc/packages-old-locale.png?branch=master)](https://travis-ci.org/ghc/packages-old-locale)
+The `old-locale` Package  [![Hackage](https://img.shields.io/hackage/v/old-locale.svg)](https://hackage.haskell.org/package/old-locale) [![Build Status](https://travis-ci.org/haskell/old-locale.svg)](https://travis-ci.org/haskell/old-locale)
+
 ========================
 
 See