From be3e7d8e2002142ba8a1b92fcbbae739b78c2cfd Mon Sep 17 00:00:00 2001 From: John Ky Date: Mon, 14 Dec 2020 16:41:10 +1100 Subject: [PATCH] Use cabal-install-3.4.0.0-rc4 on POSIX systems --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09fae6ba854..a7878a3b9c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,11 +66,18 @@ jobs: flags: -external-libsodium-vrf EOF + - name: Select optimal cabal version + run: | + case "$OS" in + Windows_NT) echo "CABAL_VERSION=3.2.0.0" >> $GITHUB_ENV;; + *) echo "CABAL_VERSION=3.4.0.0-rc4" >> $GITHUB_ENV;; + esac + - uses: actions/setup-haskell@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' && matrix.ghc == '8.10.2' @@ -131,8 +138,7 @@ jobs: cat ./cabal.project.local.ci.windows >> ./cabal.project.local cat ./cabal.project.local - # Build dependencies - - name: Build dependencies + - name: Install happy run: | cabal --builddir="$CABAL_BUILDDIR" install happy --install-method=copy