aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-07-13 10:36:20 -0700
committerGitHub <noreply@github.com>2020-07-13 10:36:20 -0700
commit86d465e572135eb33479651ef94021d17330a0d7 (patch)
treed668be2ab534162dc8653b832ba92118fad8f8da
parentc3b170be1c3c11465e5b0a64b6f59c875323a592 (diff)
parentf52337ccdc7de9221dc31e12ff646e67d6f1d5c2 (diff)
downloadpandoc-86d465e572135eb33479651ef94021d17330a0d7.tar.gz
Merge pull request #6528 from lierdakil/fix-ci-haskell-setup
[CI] Use setup-haskell action
-rw-r--r--.github/workflows/ci.yml14
1 files changed, 4 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1c5e9165..1617672ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,16 +61,10 @@ jobs:
# need to install older cabal/ghc versions from ppa repository
- name: Install recent cabal/ghc
- run: |
- if [[ ! -d /opt/ghc/${{ matrix.versions.ghc }} ]]
- then
- sudo add-apt-repository ppa:hvr/ghc
- sudo apt-get update
- sudo apt-get install ghc-${{ matrix.versions.ghc }} cabal-install-${{ matrix.versions.cabal }}
- fi
- # Use a GitHub workflow command to add folders to PATH.
- echo "::add-path::/opt/ghc/${{ matrix.versions.ghc }}/bin"
- echo "::add-path::/opt/cabal/${{ matrix.versions.cabal }}/bin"
+ uses: actions/setup-haskell@v1.1
+ with:
+ ghc-version: ${{ matrix.versions.ghc }}
+ cabal-version: ${{ matrix.versions.cabal }}
# declare/restore cached things
# caching doesn't work for scheduled runs yet