diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-09-22 09:13:48 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-09-22 09:13:48 -0700 |
| commit | 5f33df322c917a4729814296463aa7fc89b69661 (patch) | |
| tree | d27fa76a5242cdee9ae201b3b5b23dd868c3170b | |
| parent | e0984a43a99231e72c02a0a716c8d0315de9abdf (diff) | |
| download | pandoc-5f33df322c917a4729814296463aa7fc89b69661.tar.gz | |
CI: use checkout@v2, and use haskell-setup to install stack.
| -rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adc44c2e2..af8f166ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: - ghc: '8.10.2' cabal: '3.2' steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 # need to install older cabal/ghc versions from ppa repository @@ -102,11 +102,12 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v1 - - name: Install stack - shell: cmd - run: | - choco install haskell-stack + - uses: actions/checkout@v2 + + - uses: actions/setup-haskell@v1.1 + with: + enable-stack: true + stack-version: 'latest' # declare/restore cached things # caching doesn't work for scheduled runs yet @@ -148,7 +149,7 @@ jobs: cabal: '3.2' steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install recent cabal/ghc uses: actions/setup-haskell@v1.1 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 66e9857a8..fa91c342d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install dependencies run: | export PATH=/opt/cabal/3.2/bin:/opt/ghc/8.8.3/bin:$PATH @@ -41,7 +41,7 @@ jobs: runs-on: windows-2019 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install stack shell: cmd run: | @@ -71,7 +71,7 @@ jobs: runs-on: macOS-10.15 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install stack run: | curl -L https://get.haskellstack.org/stable/osx-x86_64.tar.gz -o stack.tar.gz |