Do some tidying up

[lsp-test.git] / .github / workflows / haskell.yml

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 6e70bcb6a0266e9562c4606bfe76c310addb3e26..53827ca27f8f334701613b953ff2c10aa8c95053 100644 (file)
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
-      hieref: 7cf1295a2804a527381331bb7b73d58255721edc
+      hieref: cd0d1eb88334c359b8a220f2aebec703d66012ff
 
     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
-      uses: actions/cache@v1
-      with:
-        path: ../haskell-ide-engine/dist-newstyle
-        key: ${{ runner.OS }}-${{ matrix.ghc }}-${{ env.hieref }}
+    # - 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: Build HIE
       run: |
@@ -47,12 +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
+      run: npm install -g 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
+        echo $(npm bin)
+        export PATH=$PATH:$(npm bin) 
+        cabal test