X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=5da16874d4d842b2bb43c61b42a1d699fcd16214;hb=ed60b9859b80372ecc6280d24f9e4e3f0408c192;hp=53104ff453a8e125edf69e4825f3aaa864b3a60c;hpb=27b8dd29b4330f76f6d03c570b973acd601e8e08;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index 53104ff..5da1687 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ os:
 
 dist: xenial
 
-# ghc:
-# - 8.6.5
-# cabal: '2.4'
+ghc:
+- 8.6.5
+cabal: '2.4'
 
 cache:
   directories:
@@ -35,14 +35,20 @@ addons:
     update: true
 
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install ghc; /C/ProgramData/chocolatey/bin/RefreshEnv.cmd; fi
-- ghc --version
+- |
+  if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+    choco install cabal-head -pre
+    choco install ghc nodejs
+    /C/ProgramData/chocolatey/bin/RefreshEnv.cmd
+    export PATH=/C/ProgramData/chocolatey/lib/ghc/tools/ghc-8.6.5/bin:${PATH}
+  fi
 # these are taken from the haskell language setup
 - export PATH=/opt/ghc/8.6.5/bin:${PATH}
 - export PATH=/opt/cabal/2.4/bin:${PATH}
 - export PATH=$HOME/.cabal/bin:${PATH}
+- ghc --version
 - mkdir -p $HOME/haskell-ide-engine
-- cd $HOME/haskell-ide-engine
+- pushd $HOME/haskell-ide-engine
 - git init
 - git remote add origin https://github.com/haskell/haskell-ide-engine.git
 - git pull origin master
@@ -52,7 +58,8 @@ before_install:
 - cabal v2-install hie -j2 --overwrite-policy=always
 - cabal v2-install hoogle -j2 --overwrite-policy=always
 - hoogle generate
-- cd $TRAVIS_BUILD_DIR
+- popd
+# needs to be old-install for cabal-helper to find it
 - cabal install Cabal --constraint "Cabal == 2.4.1.0"
 - npm update
 - npm i -g javascript-typescript-langserver
@@ -60,6 +67,7 @@ before_install:
 install:
 - cabal v2-build
 script:
+# until cabal v2-test supports streaming results
 - cabal v2-run lsp-test:test:tests
 
 deploy: