X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=6e70bcb6a0266e9562c4606bfe76c310addb3e26;hb=9466153bd3fec0fb4f3a6a70659fbc2ded68ff07;hp=adc622862e071f2eea48f83d182e0ee544668713;hpb=d55147cdd6b333a1fa5125a4868842266cdbb1d8;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index adc6228..6e70bcb 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -26,33 +26,33 @@ 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 binaries
+    - name: Cache HIE
       uses: actions/cache@v1
       with:
-        path: $HOME/.cabal/bin
+        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
+    # - name: Test
+    #   run: |
+    #     export PATH=$PATH:$HOME/.cabal/bin:$(npm bin) 
+    #     cabal run lsp-test:test:tests