X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=86507b4ff5fd52104bd134c9f0f900be9ba43680;hb=9c14e02fa30ce94a9635854d032294692578e02e;hp=53827ca27f8f334701613b953ff2c10aa8c95053;hpb=01da6135bd795edcf08c1462ce9925e9917df956;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 53827ca..86507b4 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -1,18 +1,21 @@
 name: Haskell CI
 
-on: [push]
+on: [push, pull_request]
 jobs:
   build:
    
     runs-on: ${{ matrix.os }}
 
     env:
-      hieref: cd0d1eb88334c359b8a220f2aebec703d66012ff
+      hieref: 8582a960dc1ca389734707f821b273b00bae54ab
 
     strategy:
       matrix:
-        ghc: ['8.6.5']
+        ghc: ['8.6.5', '8.4.4']
         os: [ubuntu-latest, macOS-latest]
+        exclude:
+          - os: macOS-latest
+            ghc: '8.4.4' # fails due to ghc panic
 
     steps:
     - uses: actions/checkout@v1
@@ -25,18 +28,18 @@ jobs:
     - name: Clone HIE
       uses: actions/checkout@v1
       with:
-        repository: mpickering/haskell-ide-engine
+        repository: haskell/haskell-ide-engine
         submodules: recursive
         ref: ${{ env.hieref }}
         path: haskell-ide-engine
 
-    # - name: Cache Cabal
-    #   uses: actions/cache@v1
-    #   with:
-    #     path: ~/.cabal
-    #     key: ${{ runner.OS }}-${{ matrix.ghc }}-cabal-${{ hashFiles('../**/*.cabal') }}
-    #     restore-keys: |
-    #       ${{ runner.OS }}-${{ matrix.ghc }}-cabal
+    - name: Cache Cabal
+      uses: actions/cache@v1.1.0
+      with:
+        path: ~/.cabal
+        key: ${{ runner.OS }}-${{ matrix.ghc }}-cabal-${{ env.hieref }}
+        restore-keys: |
+          ${{ runner.OS }}-${{ matrix.ghc }}-cabal
 
     - name: Build HIE
       run: |
@@ -50,7 +53,7 @@ jobs:
         hoogle generate
         popd
     - name: Install JS Language Server
-      run: npm install -g javascript-typescript-langserver
+      run: npm install javascript-typescript-langserver
     - name: Build
       run: cabal build
     - name: Test