Update travis and appveyor (use hackage ghcjs-dom)

leksah · Jun 23, 2016 · bfdb3a5 · bfdb3a5
1 parent 2c97555
commit bfdb3a5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/appveyor/build-some.sh b/appveyor/build-some.sh
@@ -10,7 +10,7 @@ if [ ! -d cache1 ]; then
 elif [ ! -d cache2 ]; then
   mv cache1/* $APPDATA
   cabal update
-  cabal install vendor/gi-gtk-hs vendor/ltk vendor/jsaddle-dom vendor/ghcjs-dom --force-reinstalls
+  cabal install gi-gtk-hs vendor/ltk ghcjs-dom --force-reinstalls
   mkdir cache2
   mv $APPDATA/ghc $APPDATA/cabal cache2
 elif [ ! -d cache3 ]; then

diff --git a/appveyor/cleanup-cache2.txt b/appveyor/cleanup-cache2.txt
@@ -1 +1 @@
-Change this file to clear appveyor cache2 2
+Change this file to clear appveyor cache2 3
diff --git a/cabal.project b/cabal.project
@@ -6,6 +6,3 @@ packages:
  vendor/ltk/
  vendor/haskellVCSGUI/vcsgui/
  vendor/yi/
- vendor/gi-gtk-hs/
- vendor/jsaddle-dom/
- vendor/ghcjs-dom/
diff --git a/travis/build.sh b/travis/build.sh
@@ -9,16 +9,15 @@ if [ -d .ghc ]; then cp -a .ghc /root; fi
 cabal --version
 ghc --version
 cabal update
-cabal install aeson aeson-pretty
-cabal install vendor/haskell-gi vendor/haskell-gi-base
+cabal new-build ghcjs-dom || cabal new-build ghcjs-dom
 
 # update the cache in case we time out later
 rm -rf .cabal
 cp -a /root/.cabal ./
 rm -rf .ghc
 cp -a /root/.ghc ./
 
-cabal new-build
+cabal new-build || cabal new-build
 cabal sdist
 
 # update the cache

diff --git a/vendor/ghcjs-dom b/vendor/ghcjs-dom
diff --git a/vendor/jsaddle-dom b/vendor/jsaddle-dom