X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=.travis.yml;h=8a6fd8040dc237f0f5f6d54de70af8412d7ee6c5;hb=d6b41645f54661b5b317ab36641c4243ecee3334;hp=84e60fc94808d9d7f8ba930a596f79d6797e46cb;hpb=79db6a5b2825f47f386098ce696003553204a856;p=lsp-test.git

diff --git a/.travis.yml b/.travis.yml
index 84e60fc..8a6fd80 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:
@@ -32,21 +32,34 @@ addons:
     - ghc
     - cabal-install
     - npm
+    update: true
 
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install ghc cabal nodejs; /C/ProgramData/chocolatey/bin/RefreshEnv.cmd; fi
-- export PATH=$HOME/.cabal/bin:$PATH
+- |
+  if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
+    choco install ghc cabal nodejs
+    /C/ProgramData/chocolatey/bin/RefreshEnv.cmd
+    export PATH=/C/ProgramData/chocolatey/lib/ghc/tools/ghc-8.6.5/bin:${PATH}
+    /C/ProgramData/chocolatey/bin/RefreshEnv.cmd
+  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
 - git checkout abdb097f39e135deaf321a604c95f16cbda32678
 - git submodule update --init
+- cabal v2-update
 - 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
@@ -54,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: