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

diff --git a/.travis.yml b/.travis.yml
index 729bd20..023236d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
+# language: haskell
+# ghc:
+#   - "8.2.2"
+#   - "8.4.2"
 language: c
 
 sudo: false
@@ -6,6 +10,12 @@ sudo: false
 cache:
   directories:
   - $HOME/.stack
+  - $HOME/haskell-ide-engine
+
+addons:
+  apt:
+    packages:
+    - npm
 
 before_install:
   # Download and unpack the stack executable
@@ -13,13 +23,24 @@ before_install:
   - 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
+  - cd $HOME
+  # It's ok to fail
+  - git clone https://github.com/haskell/haskell-ide-engine.git --recursive || true
   - cd haskell-ide-engine
-  - git checkout 377157dad7641c2c63e8b554a46a4888dca48721
-  - stack --no-terminal --skip-ghc-check install -j1
+  - git pull
+  - git submodule sync
+  - git submodule update
+  # - cabal new-update
+  # - cabal new-configure
+  # - cabal new-build
+  # - export PATH=$HOME/haskell-ide-engine/dist-newstyle/build/*/ghc-*/haskell-ide-engine-*/x/hie/build:$PATH
+  - stack --no-terminal --skip-ghc-check install -j2
   - stack exec hoogle generate
-  - cd ..
+  - cd $TRAVIS_BUILD_DIR
+  - npm update
+  - npm i -g javascript-typescript-langserver
 
 script:
-  - stack --no-terminal --skip-ghc-check test
+ - stack test
+  # - cabal configure --enable-tests
+  # - cabal test -j2 --show-details=streaming