X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=87a1ca10875eeb3df841de5abcb996bc10e4c3bd;hb=51a500ceafa6d32b39e8c79bbb885fd1f0d559a4;hp=0d0a10330eea8ed68776c800cb05901f5378455d;hpb=badc948ab7affaa15f5c6a6a6e8af07a74e56dea;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 0d0a103..87a1ca1 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      hieref: 7cf1295a2804a527381331bb7b73d58255721edc
+      hieref: 52691a63087ceb585c8bdc2ea04b52df3b2eddf1
 
     strategy:
       matrix:
@@ -25,34 +25,35 @@ jobs:
     - name: Clone HIE
       uses: actions/checkout@v1
       with:
-        repository: haskell/haskell-ide-engine
-        submodules: recurse
+        repository: mpickering/haskell-ide-engine
+        submodules: recursive
         ref: ${{ env.hieref }}
         path: haskell-ide-engine
 
-    - name: Cache cabal
+    - name: Cache HIE
       uses: actions/cache@v1
       with:
-        path: $HOME/.cabal
+        path: ../haskell-ide-engine/dist-newstyle
         key: ${{ runner.OS }}-${{ matrix.ghc }}-${{ env.hieref }}
 
     - name: Build HIE
       run: |
-        if [ ! -f $HOME/.cabal/bin/hie ]; then
-            echo "hie is already built"
-            exit 0
-        fi
-        pushd haskell-ide-engine
+        # if [ -e $HOME/.cabal/bin/hie ]; then
+        #     echo "hie is already built"
+        #     exit 0
+        # fi
+        pushd ../haskell-ide-engine
         cabal install hie
         cabal install hoogle
-        export PATH=$PATH:$HOME/.cabal/bin
         hoogle generate
         popd
+        cabal v1-install Cabal --constraint "Cabal == 3.0.0.0"
     - name: Install JS Language Server
       run: npm install javascript-typescript-langserver
     - name: Build
       run: cabal build
     - name: Test
       run: |
-        export PATH=$PATH:$HOME/.cabal/bin:$(npm bin) 
-        cabal test
+        echo $PATH
+        export PATH=$PATH:$(npm bin) 
+        cabal run lsp-test:test:tests