Skip to content

Commit

Permalink
Merge pull request #2147 from input-output-hk/upgrade-to-cabal-3.4.0.0
Browse files Browse the repository at this point in the history
Upgrade to cabal-3.4.0.0
  • Loading branch information
nc6 committed Feb 25, 2021
2 parents 833c0eb + a74999a commit 0d81fb1
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/haskell.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.6.5", "8.10.3"]
ghc: ["8.6.5", "8.10.4"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -61,11 +61,18 @@ jobs:
echo "LIBSODIUM_PATH=$LIBSODIUM_PATH"
echo "$LIBSODIUM_PATH" >> $GITHUB_PATH
- uses: actions/setup-haskell@v1
- name: Select optimal cabal version
run: |
case "$OS" in
Windows_NT) echo "CABAL_VERSION=3.4.0.0-rc5" >> $GITHUB_ENV;;
*) echo "CABAL_VERSION=3.4.0.0" >> $GITHUB_ENV;;
esac
- uses: haskell/actions/setup@v1
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: '3.2.0.0'
cabal-version: ${{ env.CABAL_VERSION }}

- name: Patch GHC 8.10.2 linker
if: matrix.os == 'windows-latest'
Expand Down

0 comments on commit 0d81fb1

Please sign in to comment.