Skip to content

Commit 4960764

Browse files
authored
Merge pull request #11929 from cabalism/fix/cabal-doctest-ghc-9.12
Running cabal doctest with ghc-9.12
2 parents e08f28b + a47eadb commit 4960764

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

.github/workflows/quick-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- created
1616

1717
env:
18-
GHC_FOR_QUICK_JOBS: 9.10.3
18+
GHC_FOR_QUICK_JOBS: 9.12.2
1919

2020
jobs:
2121
meta:

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,21 @@ ghcid-cli: ## Run ghcid for the cabal-install executable.
151151

152152
.PHONY: doctest
153153
doctest: ## Run doctests.
154+
cabal --numeric-version
154155
cd Cabal-syntax && $(DOCTEST)
155156
cd Cabal-described && $(DOCTEST)
156157
cd Cabal && $(DOCTEST)
157158
cd cabal-install-solver && $(DOCTEST)
158159
cd cabal-install && $(DOCTEST)
159160

161+
# If we pin and periodically bump the version of doctest, we get more
162+
# reproducible testing. Initially we pinned to doctest-0.25.0 to avoid failures
163+
# with doctest-0.24.3 but `cabal install doctest` depends on index state that
164+
# itself gets bumped when `cabal update --ignore-project` is run.
165+
# SEE: https://github.com/haskell/cabal/issues/11493#issuecomment-4615438425
160166
.PHONY: doctest-install
161167
doctest-install: ## Install doctest tool needed for running doctests.
162-
cabal install doctest --overwrite-policy=always --ignore-project --flag cabal-doctest
168+
cabal install doctest-0.25.0 --overwrite-policy=always --ignore-project --flag cabal-doctest
163169

164170
# tests
165171

0 commit comments

Comments
 (0)