X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=.github%2Fworkflows%2Fhaskell.yml;h=06086160c15dc9edb78f3c39a7b2f82b493bd097;hp=4b593b99fed343051aef93699b8bf988daa21319;hb=109cc7395312c9f8c7d973701200ff0a9efa4363;hpb=33e01cbb9cddcd84cbb1a25d25d2e63a1c0e1146

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 4b593b9..0608616 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -33,32 +33,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 }}
+        restore-keys: |
+          ${{ runner.OS }}-${{ matrix.ghc }}-cabal
+
+    - name: Cache Hoogle
+      uses: actions/cache@v1.1.0
+      with:
+        path: ~/.hoogle
+        key: ${{ runner.OS }}-${{ matrix.ghc }}-hoogle-${{ env.hieref }}
 
     - 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