Try out v2 builds again

diff --git a/.travis.yml b/.travis.yml
index c1cf11beaad342911054bcdd2adf88fb9ec4659f..60bd6eb039195bdce9e72e934fde5401ae3884e6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,18 @@
-language: c
+language: haskell
+dist: xenial
+ghc:
+  - "8.6.5"
+cabal: "2.4"
 
 sudo: false
 
 cache:
   directories:
-    - .stack-work
-    - $HOME/.stack
-    - $HOME/haskell-ide-engine/.stack-work
+    - $HOME/.cabal
+    - $HOME/haskell-ide-engine/dist-newstyle
+    # - .stack-work
+    # - $HOME/.stack
+    # - $HOME/haskell-ide-engine/.stack-work
   timeout: 1000
 
 addons:
@@ -15,23 +21,23 @@ addons:
       - npm
 
 before_install:
-  - 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'
+  # - 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'
   - mkdir -p haskell-ide-engine
   - cd $HOME/haskell-ide-engine
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
   - git pull origin master
-  - git checkout 47b5281d9d8ffe7348f7f7fcb3ce36b4eabd4f06
-  - git submodule init
-  - git submodule sync
+  - git checkout abdb097f39e135deaf321a604c95f16cbda32678
   - git submodule update --init
-  - stack --no-terminal --skip-ghc-check -j2 install
-  - stack exec hoogle generate
+  - cabal v2-install hie
+  # - stack --no-terminal --skip-ghc-check -j2 install --fast
+  # - stack exec hoogle generate
+  - cabal v2-run hoogle generate
   - cd $TRAVIS_BUILD_DIR
   - npm update
   - npm i -g javascript-typescript-langserver
 
 script:
-  - stack test
+  - cabal v2-test

diff --git a/stack.yaml b/stack.yaml
index 26a1ba2b1913627dfa9b3e565b7a2fe82c9f7d84..9790abab9f6cb4681fd9fcddf163377fa9142fac 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-13.21
+resolver: lts-13.24
 packages:
   - .