X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=6ab65dd113a7148403420f338ebe57a5204e8734;hb=0b0cd9b189f63f9efdf6949538ccfa432d6f3908;hp=4b593b99fed343051aef93699b8bf988daa21319;hpb=4c6cc8593438b195326ef99cc8d8d33030b1b4d6;p=lsp-test.git

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 4b593b9..6ab65dd 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      hieref: 8582a960dc1ca389734707f821b273b00bae54ab
+      hieref: caf72237f596255eef3e614330db353c15b6c46b
 
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.4.4']
+        ghc: ['8.8.1', '8.6.5', '8.4.4']
         os: [ubuntu-latest, macOS-latest]
         exclude:
           - os: macOS-latest
@@ -23,7 +23,6 @@ jobs:
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: '3.0'
-    - run: cabal update
 
     - name: Clone HIE
       uses: actions/checkout@v1
@@ -33,32 +32,38 @@ jobs:
         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 }}
+
+    - name: Cache Hoogle
+      uses: actions/cache@v1.1.0
+      with:
+        path: ~/.hoogle
+        key: ${{ runner.OS }}-${{ matrix.ghc }}-hoogle-${{ env.hieref }}
+
+    - run: cabal update
 
     - name: Build HIE
       run: |
-        # 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
+    - name: Generate hoogle database
+      run: |
+        if [ -d $HOME/.hoogle ]; then
+           echo "hoogle database already built"
+           exit 0
+        fi
+        hoogle generate
     - name: Install JS Language Server
       run: npm install javascript-typescript-langserver
     - name: Build
       run: cabal build
     - name: Test
       run: |
-        echo $PATH
-        echo $(npm bin)
         export PATH=$PATH:$(npm bin) 
         cabal test