Test with GHC 7.4.2 up to 8.2.1.

mainland · May 3, 2017 · a238fc4 · a238fc4
1 parent 61686c4
commit a238fc4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,9 +25,12 @@ matrix:
     - env: CABALVER=1.22 GHCVER=7.10.3 FLAGS=""
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
-    - env: CABALVER=1.24 GHCVER=8.0.1 FLAGS=""
-      compiler: ": #GHC 8.0.1"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.0.2 FLAGS=""
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
+    - env: CABALVER=head GHCVER=8.2.1 FLAGS=""
+      compiler: ": #GHC 8.2.1"
+      addons: {apt: {packages: [cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head FLAGS=""
       addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
 
@@ -52,28 +55,26 @@ install:
  - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
 
 # check whether current requested install-plan matches cached package-db snapshot
- - CABSNAP=$(ghc --numeric-version)
- - if diff -u installplan.txt $HOME/.cabsnap/$CABSNAP/installplan.txt;
+ - if diff -u $HOME/.cabsnap/installplan.txt installplan.txt;
    then
      echo "cabal build-cache HIT";
      rm -rfv .ghc;
-     cp -a $HOME/.cabsnap/$CABSNAP/ghc $HOME/.ghc;
-     cp -a $HOME/.cabsnap/$CABSNAP/lib $HOME/.cabsnap/$CABSNAP/share $HOME/.cabsnap/$CABSNAP/bin $HOME/.cabal/;
+     cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
+     cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
    else
      echo "cabal build-cache MISS";
-     rm -rf $HOME/.cabsnap/$CABSNAP;
+     rm -rf $HOME/.cabsnap;
      mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
      cabal install --only-dependencies --enable-tests --enable-benchmarks $FLAGS;
    fi
 
 # snapshot package-db on cache miss
- - if [ ! -d $HOME/.cabsnap/$CABSNAP ];
+ - if [ ! -d $HOME/.cabsnap ];
    then
       echo "snapshotting package-db to build-cache";
       mkdir $HOME/.cabsnap;
-      mkdir $HOME/.cabsnap/$CABSNAP;
-      cp -a $HOME/.ghc $HOME/.cabsnap/$CABSNAP/ghc;
-      cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/$CABSNAP/;
+      cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
+      cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
    fi
 
 # Here starts the actual work to be performed for the package under test;

diff --git a/LICENSE b/LICENSE
@@ -25,7 +25,7 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
-Copyright (c) 2016
+Copyright (c) 2016-2017
         Drexel University.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/libltdl.cabal b/libltdl.cabal
@@ -4,14 +4,15 @@ cabal-version:  >= 1.8
 license:        BSD3
 license-file:   LICENSE
 copyright:      (c) 2011 Harvard University
-                (c) 2016 Drexel University
-author:         Geoffrey Mainland <mainland#drexel.edu>
+                (c) 2016-2017 Drexel University
+author:         Geoffrey Mainland <mainland@drexel.edu>
 maintainer:     mainland@eecs.harvard.edu
 stability:      alpha
 homepage:       https://github.com/mainland/libltdl
 category:       Foreign
 synopsis:       FFI interface to libltdl
 description:    This package provides an interface to GNU libtldl.
+tested-with:    GHC==7.4.2, GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2, GHC==8.2.1
 
 build-type:     Custom