[commit: packages/time] wip/travis: Disable travis caching logic for now (6c35d3a)

git at git.haskell.org git at git.haskell.org
Sat May 7 06:51:10 UTC 2016


Repository : ssh://git@git.haskell.org/time

On branch  : wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/6c35d3a7433173ca92771153f3ad483435a8b447

>---------------------------------------------------------------

commit 6c35d3a7433173ca92771153f3ad483435a8b447
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu May 5 12:12:45 2016 +0200

    Disable travis caching logic for now


>---------------------------------------------------------------

6c35d3a7433173ca92771153f3ad483435a8b447
 .travis.yml | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index de662d8..245ec22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ sudo: false
 
 cache:
   directories:
-    - $HOME/.cabsnap
     - $HOME/.cabal/packages
 
 before_cache:
@@ -37,37 +36,16 @@ install:
    fi
  - travis_retry 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
 
-# check whether current requested install-plan matches cached package-db snapshot
- - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
-   then
-     echo "cabal build-cache HIT";
-     rm -rfv .ghc;
-     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;
-     mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
-     cabal install --only-dependencies --enable-tests --enable-benchmarks;
-   fi
-
-# snapshot package-db on cache miss
- - if [ ! -d $HOME/.cabsnap ];
-   then
-      echo "snapshotting package-db to build-cache";
-      mkdir $HOME/.cabsnap;
-      cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
-      cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
-   fi
+# cache-logic disabled for now
 
 # 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.
 script:
  - if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal configure --enable-tests --enable-benchmarks -v2  # -v2 provides useful information for debugging
+# worarkound cyclic deps within testsuite
+ - cabal install . 'QuickCheck >= 2.5.1' 'test-framework >= 0.8' 'test-framework-quickcheck2'
+ - cabal configure --enable-tests -v2  # -v2 provides useful information for debugging
  - cabal build   # this builds all libraries and executables (including tests/benchmarks)
  - cabal test
  - cabal check



More information about the ghc-commits mailing list