X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=.travis.yml;h=a85c52a621dd2d91a9ce181d4f61792a2d43cd31;hp=729bd20fdec694cada5f89850f4246129573a505;hb=9d89c237916fbeed63ca52aa5f93465579a5c576;hpb=0c8e8f8436125b79e91a51267ca581d2e352e702

diff --git a/.travis.yml b/.travis.yml
index 729bd20..a85c52a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
-language: c
+language: haskell
+
+ghc:
+  - "8.2.2"
+  - "8.4.2"
 
 sudo: false
 
@@ -7,19 +11,31 @@ cache:
   directories:
   - $HOME/.stack
 
+addons:
+  apt:
+    packages:
+    - npm
+
 before_install:
   # Download and unpack the stack executable
   - mkdir -p ~/.local/bin
   - export PATH=$HOME/.local/bin:$PATH
   - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
     
-install:
-  - git clone https://github.com/Bubba/haskell-ide-engine.git --recursive
+  - git clone https://github.com/haskell/haskell-ide-engine.git --recursive
   - cd haskell-ide-engine
-  - git checkout 377157dad7641c2c63e8b554a46a4888dca48721
-  - stack --no-terminal --skip-ghc-check install -j1
+  - git submodule sync
+  - git submodule update
+  # - cabal new-update
+  # - cabal new-configure
+  # - cabal new-build
+  # - export PATH=dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
+  - stack --no-terminal --skip-ghc-check install -j2
   - stack exec hoogle generate
   - cd ..
+  - npm update
+  - npm i -g javascript-typescript-langserver
 
 script:
-  - stack --no-terminal --skip-ghc-check test
+  - cabal new-configure
+  - cabal new-test -O2