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

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 0d0a103..e027500 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -26,28 +26,28 @@ jobs:
       uses: actions/checkout@v1
       with:
         repository: haskell/haskell-ide-engine
-        submodules: recurse
+        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
@@ -55,4 +55,4 @@ jobs:
     - name: Test
       run: |
         export PATH=$PATH:$HOME/.cabal/bin:$(npm bin) 
-        cabal test
+        cabal run lsp-test:test:tests