From: Luke Lau <luke_lau@icloud.com>
Date: Sat, 5 Oct 2019 20:30:37 +0000 (+0100)
Subject: Squashed commit of the following:
X-Git-Tag: 0.8.0.0~4
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=50a0c87ace126635ec152ad05fdce698a8dc0310

Squashed commit of the following:

commit 0980bdc3a13cc183ef4de6a00820d386c498d7f7
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Oct 5 21:29:08 2019 +0100

    Tidy up workflow

commit 83f521b928a6c952dba54061dde684869ca5c669
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 19:50:10 2019 +0100

    Update haskell.yml

commit 588e085d12244b795441c0e17b71a561ac5db80b
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 15:09:13 2019 +0100

    Debug PATH

commit 89407b82feba0a4c025d118eb6bf03b3fa6bef39
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 14:00:38 2019 +0100

    Add cabal bin to PATH

commit 0de9d38dfe3a9b0f9c029e9da72054261702e3f1
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 12:12:17 2019 +0100

    Update haskell.yml

commit 9fa751f3d517dd071d9af47ae42988c6acd7334f
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 12:09:13 2019 +0100

    Update haskell.yml

commit d6bfa2476eae9b86896bdcf9116965feccb2ca7a
Merge: 550d88c c066f37
Author: Luke Lau <luke_lau@icloud.com>
Date:   Wed Oct 2 12:08:03 2019 +0100

    Merge branch 'github-actions' of https://github.com/bubba/lsp-test into github-actions

commit 550d88ca15b7909e2988d400f0fd0882304c1d1f
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:19:04 2019 -0400

    Add secret

commit 1d9d650e6391f03527db6bae6b0e8d6ac9c2231c
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:15:15 2019 -0400

    Add hlinter

commit 860ba10766f52281e31fe1a778e290b30ac37676
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:11:27 2019 -0400

    Try upgrading ghc and cabal

commit c066f37e7955511a5f02acefb2d8c7360397d3df
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:19:04 2019 -0400

    Add secret

commit 80aeabcf9c63706c07c33f0933c2622aac7fc376
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:15:15 2019 -0400

    Add hlinter

commit 2d99d48db3865ad7f5916fea82ad4ce8b6a695f4
Author: Luke Lau <luke_lau@icloud.com>
Date:   Sat Aug 24 18:11:27 2019 -0400

    Try upgrading ghc and cabal
---

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 32c54b9..e4cdf76 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -9,18 +9,24 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Install dependencies
-      run: cabal install --only-dependencies --enable-tests
+    - uses: actions/setup-haskell@v1
+      with:
+        ghc-version: '8.6.5'
+        cabal-version: '3.0'
+    - run: cabal update
     - name: Install HIE
       run: |
         pushd $HOME
         git clone https://github.com/haskell/haskell-ide-engine --recurse-submodules
         cd haskell-ide-engine
-        cabal v2-install hie
-        cabal v2-install hoogle
+        cabal install hie
+        cabal install hoogle
+        export PATH=$PATH:$HOME/.cabal/bin
         hoogle generate
         popd
     - name: Build
-      run: cabal v2-build
-    - name: Run tests
-      run: cabal v2-test
+      run: cabal build
+    - name: Test
+      run: |
+        export PATH=$PATH:$HOME/.cabal/bin
+        cabal test