X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=7d90328b36500cabc19b5f5cbdec766f49534bde;hb=d46bb3df79fd71344d0c8d7c6de5b67c99f65906;hp=be047459ba02f0279df2ecf9e02a1c8469f68312;hpb=81f355b80c168555f5af9a40bd3722e27e1b20a6;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index be04745..7d90328 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,37 @@ jobs:
     - name: Clone HIE
       uses: actions/checkout@v1
       with:
-        repository: haskell/haskell-ide-engine
+        repository: mpickering/haskell-ide-engine
         submodules: recursive
         ref: ${{ env.hieref }}
         path: haskell-ide-engine
 
-    - name: Cache Cabal binaries
+    - name: Cache Cabal
       uses: actions/cache@v1
       with:
-        path: $HOME/.cabal/bin
-        key: ${{ runner.OS }}-${{ matrix.ghc }}-${{ env.hieref }}
+        path: ~/.cabal
+        key: ${{ runner.OS }}-${{ matrix.ghc }}-cabal-${{ hashFiles('../**/*.cabal') }}
+        restore-keys: |
+          ${{ runner.OS }}-${{ matrix.ghc }}-cabal
 
     - name: Build HIE
       run: |
-        if [ -e $HOME/.cabal/bin/hie ]; then
-            echo "hie is already built"
-            exit 0
-        fi
-        ls ../
+        # 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
         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: |
+    #     echo $PATH
+    #     export PATH=$PATH:$(npm bin) 
+    #     cabal run lsp-test:test:tests