Skip to content

Commit

Permalink
hackport.cabal: Fix doctest-v2
Browse files Browse the repository at this point in the history
build-tool-depends doesn't play nice with Setup.hs installs, and tries
to rebuild cabal-install/doctest locally. This has recently caused some
compilation errors when it tries to build cabal-install, so we'll just
remove it from build-tool-depends on the assumption that whoever is
running doctest-v2 probably has /usr/bin/cabal on their system.

Stop using all but Cabal-3.8 on GitHub tests. The others fail during
dependency resolution complaining that they cannot build ghc.

This reverts commit 51bc8c1.

See: gentoo-haskell/gentoo-haskell#1074
See: haskell/cabal#8434
Signed-off-by: hololeap <[email protected]>
  • Loading branch information
hololeap committed May 27, 2023
1 parent eeb7398 commit 96a5640
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ jobs:
strategy:
matrix:
cabal:
[ "3.4"
, "3.6"
, "3.8"
[ "3.8"
]
ghc:
[ "8.8"
Expand All @@ -24,13 +22,6 @@ jobs:
, "9.2"
, "9.4"
]
exclude:
- cabal: "3.4"
ghc: "9.2"
- cabal: "3.4"
ghc: "9.4"
- cabal: "3.6"
ghc: "9.4"
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -61,5 +52,5 @@ jobs:
cabal build --only-dependencies
- name: Build
run: cabal build
- name: Run spec test
run: cabal test --test-option=--color --test-show-details=streaming spec
- name: Run all enabled tests
run: cabal test --test-option=--color --test-show-details=streaming
5 changes: 1 addition & 4 deletions hackport.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -1026,9 +1026,6 @@ test-suite doctests

test-suite doctests-v2
import: warnings
-- doctests-v2 is causing problems, looking for ghc lib and alex on
-- github CI. This may be fixable.
buildable: False
type: exitcode-stdio-1.0
default-language: Haskell98
hs-source-dirs: tests/doctests-v2
Expand All @@ -1038,7 +1035,7 @@ test-suite doctests-v2
, process

build-tool-depends:
, cabal-install:cabal >=3.4
-- cabal-install should already be installed if this is being built...
, doctest:doctest >=0.8

if flag(cabal-v1)
Expand Down

0 comments on commit 96a5640

Please sign in to comment.