Try ghc=HC

haskell · Jul 22, 2021 · 1282164 · 1282164
1 parent e532ab7
commit 1282164
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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