X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=7d90328b36500cabc19b5f5cbdec766f49534bde;hb=d46bb3d;hp=76e1cbc6697ae9f87f562ed456bfde6e83cd9d82;hpb=005f2a5b9a388355fac1978a0c191ace407703dc;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 76e1cbc..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,16 +25,18 @@ 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 HIE
+    - name: Cache Cabal
       uses: actions/cache@v1
       with:
-        path: haskell-ide-engine/dist-newstyle
-        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: |
@@ -47,11 +49,13 @@ jobs:
         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 run lsp-test:test:tests
+    # - name: Test
+    #   run: |
+    #     echo $PATH
+    #     export PATH=$PATH:$(npm bin) 
+    #     cabal run lsp-test:test:tests