@@ -47,10 +47,7 @@ jobs:
48 - name: Configure
48 - name: Configure
50− # Using separate store-dir because default one already has 'ghc-paths' package installed
51− # with hardcoded path to ghcup's GHC path (which it was built with). This leads to failure in
52− # doctest, as it tries to invoke that GHC, and it doesn't exist here.
53− cabal --store-dir /tmp/cabal-store install --ignore-project -j2 doctest --constraint='doctest ^>=0.18'
50+ cabal install --ignore-project -j2 doctest --constraint='doctest ^>=0.20'
55 - name: Build
52 - name: Build
@@ -68,24 +65,17 @@ jobs:
68 # Necessary for doctest to be found in $PATH
65 # Necessary for doctest to be found in $PATH
69 export PATH="$HOME/.cabal/bin:$PATH"
66 export PATH="$HOME/.cabal/bin:$PATH"
71− # Filter out base-compat-batteries from .ghc.environment.*, as its modules
68+ DOCTEST="cabal repl --with-ghc=doctest --ghc-options=-w"
72− # conflict with those of base-compat.
74− # FIXME: This is an ugly hack. Ultimately, we'll want to use cabal-doctest
75− # (or cabal v2-doctest, if it ever lands) to provide a clean GHC environment.
76− # This might allow running doctests in GHCJS build as well.
77− perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat-batteries)-\d+(\.\d+)*/; }' .ghc.environment.*
79− (cd servant && doctest src)
69+ (cd servant && eval $DOCTEST)
80− (cd servant-client && doctest src)
70+ (cd servant-client && eval $DOCTEST)
81− (cd servant-client-core && doctest src)
71+ (cd servant-client-core && eval $DOCTEST)
82− (cd servant-http-streams && doctest src)
72+ (cd servant-http-streams && eval $DOCTEST)
83− (cd servant-docs && doctest src)
73+ (cd servant-docs && eval $DOCTEST)
84− (cd servant-foreign && doctest src)
74+ (cd servant-foreign && eval $DOCTEST)
85− (cd servant-server && doctest src)
75+ (cd servant-server && eval $DOCTEST)
86− (cd servant-machines && doctest src)
76+ (cd servant-machines && eval $DOCTEST)
87− (cd servant-conduit && doctest src)
77+ (cd servant-conduit && eval $DOCTEST)
88− (cd servant-pipes && doctest src)
78+ (cd servant-pipes && eval $DOCTEST)
91 name: stack / ghc ${{ matrix.ghc }}
81 name: stack / ghc ${{ matrix.ghc }}