From b5dc4dd350dd9af75b2c31affcfaea24b2a26c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Hahn?= <soenkehahn@gmail.com>
Date: Wed, 6 Apr 2016 11:41:41 +0800
Subject: [PATCH] travis-wip

---
 .travis-ghc.sh                      | 6 ------
 .travis.yml                         | 9 +--------
 .travis-ghcjs.sh => travis-ghcjs.sh | 4 +++-
 3 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100755 .travis-ghc.sh
 rename .travis-ghcjs.sh => travis-ghcjs.sh (96%)

diff --git a/.travis-ghc.sh b/.travis-ghc.sh
deleted file mode 100755
index 1dc5ac84..00000000
--- a/.travis-ghc.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#/usr/bin/env bash
-set -ev
-
-for package in $(cat sources.txt); do
-  (cd $package && tinc && cabal configure --enable-tests --disable-optimization && cabal build && cabal test) || exit 1
-done
diff --git a/.travis.yml b/.travis.yml
index b2bad73b..75e5cc15 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,19 +27,12 @@ install:
   - travis_retry cabal update
   - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
 
-  # set up stack (for ghcjs in servant-client)
-  - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
-  - stack --version
-
 script:
   - if [ "$GHCJS" = "true" ];
-      then ./.travis-ghcjs.sh ;
+      then ./travis-ghcjs.sh ;
       else ./travis.sh ;
     fi
-  - export CASHER_TIME_OUT=500
 
 cache:
   directories:
     - $HOME/.tinc/cache
-    - $HOME/.stack
-    - $HOME/.ghcjs
diff --git a/.travis-ghcjs.sh b/travis-ghcjs.sh
similarity index 96%
rename from .travis-ghcjs.sh
rename to travis-ghcjs.sh
index 2ae23d62..40e719d6 100755
--- a/.travis-ghcjs.sh
+++ b/travis-ghcjs.sh
@@ -3,7 +3,9 @@ set -ev
 
 # tinc
 #cabal exec which hspec-discover
-#barf
+barf
+
+
 cabal install hspec-discover --prefix $HOME/.local
 # export PATH=$HOME/huhu/bin:$PATH
 which hspec-discover