From dd9f85d63b7c2a5ea0124b383d90ad61ef65079a Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 30 Oct 2024 16:08:39 +0100 Subject: [PATCH] Drop 8.2 from Stack CI and fix doctest in Haskell CI --- .github/workflows/haskell-ci.yml | 6 ++++-- .github/workflows/stack.yml | 3 ++- source/BNFC.cabal | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index eae86f55..347be53e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -256,11 +256,13 @@ jobs: run: | $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - name: install doctest + if: env.HEADHACKAGE != 'true' run: | - $CABAL v2-install $ARG_COMPILER doctest --overwrite-policy=always + $CABAL v2-install --ignore-project $ARG_COMPILER doctest --ghc-options=-rtsopts --overwrite-policy=always - name: doctests + if: env.HEADHACKAGE != 'true' run: | - $CABAL v2-repl BNFC --with-ghc-pkg=$HCPKG -w doctest --repl-options=-fno-warn-type-defaults + $CABAL v2-repl BNFC --with-ghc-pkg=$HCPKG -w doctest --repl-options=-w - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 8e421c37..095f98bf 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -23,7 +23,8 @@ jobs: fail-fast: false matrix: # Note: check release logic below when changing the matrix! - ghc: ['9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4', '8.2'] + # Stack 3.1.1 only supports GHC 8.4 and up. + ghc: ['9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6', '8.4'] os: [ubuntu-latest] include: - os: macOS-latest diff --git a/source/BNFC.cabal b/source/BNFC.cabal index 980d2cd1..62632a92 100644 --- a/source/BNFC.cabal +++ b/source/BNFC.cabal @@ -65,7 +65,6 @@ extra-source-files: stack-8.8.yaml stack-8.6.yaml stack-8.4.yaml - stack-8.2.yaml source-repository head type: git