haskell-effectful/effectful
1
1
Fork 0
mirror of https://github.com/haskell-effectful/effectful.git synced 2024-11-26 15:25:46 +03:00
Code Issues Projects Releases Wiki Activity

Run doctest with GHC 9.6 (#187)

Browse Source
This commit is contained in:
Andrzej Rybczak 2023-10-03 19:42:16 +02:00 committed by GitHub
parent 5d677d51d7
commit 1f81eb7305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/haskell-ci.yml vendored
View File

@ -158,7 +158,7 @@ jobs:
- name: cache (tools) - name: cache (tools)
uses: actions/cache/restore@v3 uses: actions/cache/restore@v3
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-b1ce34ec key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ffb5680b
path: ~/.haskell-ci-tools path: ~/.haskell-ci-tools
- name: install cabal-plan - name: install cabal-plan
run: | run: |
@ -171,13 +171,13 @@ jobs:
cabal-plan --version cabal-plan --version
- name: install doctest - name: install doctest
run: | run: |
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.22' ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then doctest --version ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then doctest --version ; fi
- name: save cache (tools) - name: save cache (tools)
uses: actions/cache/save@v3 uses: actions/cache/save@v3
if: always() if: always()
with: with:
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-b1ce34ec key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ffb5680b
path: ~/.haskell-ci-tools path: ~/.haskell-ci-tools
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -268,12 +268,12 @@ jobs:
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
- name: doctest - name: doctest
run: | run: |
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cd ${PKGDIR_effectful_core} || false ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_effectful_core} || false ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cd ${PKGDIR_effectful_th} || false ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_effectful_th} || false ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cd ${PKGDIR_effectful} || false ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cd ${PKGDIR_effectful} || false ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi if [ $((HCNUMVER < 90800)) -ne 0 ] ; then doctest -XHaskell2010 -XBangPatterns -XConstraintKinds -XDataKinds -XDeriveFunctor -XDeriveGeneric -XFlexibleContexts -XFlexibleInstances -XGADTs -XGeneralizedNewtypeDeriving -XLambdaCase -XMultiParamTypeClasses -XNoStarIsType -XRankNTypes -XRecordWildCards -XRoleAnnotations -XScopedTypeVariables -XStandaloneDeriving -XTupleSections -XTypeApplications -XTypeFamilies -XTypeOperators src ; fi
- name: cabal check - name: cabal check
run: | run: |
cd ${PKGDIR_effectful_core} || false cd ${PKGDIR_effectful_core} || false

2
cabal.haskell-ci
View File

@ -1,6 +1,6 @@
branches: master branches: master
doctest: <9.5 doctest: <9.7
doctest-skip: effectful-plugin doctest-skip: effectful-plugin
tests: True tests: True

2
effectful-core/src/Effectful/Dispatch/Dynamic.hs
View File

@ -760,7 +760,7 @@ localLiftUnliftIO (LocalEnv les) strategy k = case strategy of
-- localSeqUnlift env $ \unlift -> unlift m -- localSeqUnlift env $ \unlift -> unlift m
-- :} -- :}
-- ... -- ...
-- ...Could not deduce (SharedSuffix '[] es)... -- ...Could not deduce ...SharedSuffix '[] es...
-- ... -- ...
-- --
-- Running local actions in a monomorphic effect stack is also not fine as -- Running local actions in a monomorphic effect stack is also not fine as

2
effectful-core/src/Effectful/Dispatch/Static.hs
View File

@ -130,7 +130,7 @@ import Effectful.Internal.Monad
-- runLog logger = evalStaticRep (Log logger) -- runLog logger = evalStaticRep (Log logger)
-- :} -- :}
-- ... -- ...
-- ...No instance for (IOE :> es) arising from a use of ‘evalStaticRep’ -- ...No instance for ...IOE :> es... arising from a use of ‘evalStaticRep’
-- ... -- ...
-- --
-- Including @'IOE' :> es@ in the context fixes the problem: -- Including @'IOE' :> es@ in the context fixes the problem:

2
effectful-th/src/Effectful/TH.hs
View File

@ -33,7 +33,7 @@ import Effectful.Dispatch.Dynamic
-- --
-- >>> :kind! DispatchOf E -- >>> :kind! DispatchOf E
-- DispatchOf E :: Dispatch -- DispatchOf E :: Dispatch
-- = 'Dynamic -- ...Dynamic
-- --
-- >>> :i op1 -- >>> :i op1
-- op1 :: (HasCallStack, E :> es) => Int -> Eff es a -> Eff es a -- op1 :: (HasCallStack, E :> es) => Int -> Eff es a -> Eff es a