From 1282164ab94fc46cf35ce70c86e20d937c3b9860 Mon Sep 17 00:00:00 2001 From: David Knothe Date: Thu, 22 Jul 2021 15:22:05 +0200 Subject: [PATCH] Try ghc=HC --- .github/haskell-ci.patch | 2 +- .github/workflows/haskell-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/haskell-ci.patch b/.github/haskell-ci.patch index d8819a20..918801f9 100644 --- a/.github/haskell-ci.patch +++ b/.github/haskell-ci.patch @@ -32,7 +32,7 @@ + export HAPPY=$HOME/.cabal/bin/happy + export HC + export CABAL -+ if [[ $(ghc --numeric-version) == "8.10.1" ]] ++ if [[ $($ghc --numeric-version) == "8.10.1" ]] + then + make sdist-test + else diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 30f55f57..ea178c70 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -107,6 +107,7 @@ jobs: echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" HCDIR=/opt/$HCKIND/$HCVER HC=$HCDIR/bin/$HCKIND + ghc=$HC echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" @@ -249,7 +250,7 @@ jobs: export HAPPY=$HOME/.cabal/bin/happy export HC export CABAL - if [[ $(ghc --numeric-version) == "8.10.1" ]] + if [[ $($ghc --numeric-version) == "8.10.1" ]] then make sdist-test else