3375ca6 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

Run doctests with GHC-8.10.3 too

commit3375ca66a3f8ec8ae8b1feb98cd73e3e7abcbc75 authorOleg Grenrus <oleg.grenrus@iki.fi> dateMon 4 Jan 2021, 01:41 (6 years ago) parent56f2f9b

4 files changed+8−8

compare with master

unifiedsplit

.github/workflows/haskell-ci.yml+5−5 cabal.haskell-ci+1−1 http-api-data.cabal+1−1 src/Web/Internal/HttpApiData.hs+1−1

.github/workflows/haskell-ci.yml+5−5

@@ -110,7 +110,7 @@ jobs:

110110 - name: cache (tools)

111111 uses: actions/cache@v2

112112 with:

113− key: ${{ runner.os }}-${{ matrix.ghc }}-tools-0f645703

113+ key: ${{ runner.os }}-${{ matrix.ghc }}-tools-b869866c

114114 path: ~/.haskell-ci-tools

115115 - name: install cabal-plan

116116 run: |

@@ -123,8 +123,8 @@ jobs:

123123 cabal-plan --version

124124 - name: install doctest

125125 run: |

126− if [ $((HCNUMVER >= 80000 && HCNUMVER < 81000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

127− if [ $((HCNUMVER >= 80000 && HCNUMVER < 81000)) -ne 0 ] ; then doctest --version ; fi

126+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

127+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then doctest --version ; fi

128128 - name: checkout

129129 uses: actions/checkout@v2

130130 with:

@@ -178,8 +178,8 @@ jobs:

178178 - name: doctest

179179 run: |

180180 perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*

181− if [ $((HCNUMVER >= 80000 && HCNUMVER < 81000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

182− if [ $((HCNUMVER >= 80000 && HCNUMVER < 81000)) -ne 0 ] ; then doctest src/ ; fi

181+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

182+ if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then doctest src/ ; fi

183183 - name: cabal check

184184 run: |

185185 cd ${PKGDIR_http_api_data} || false

cabal.haskell-ci+1−1

@@ -1,5 +1,5 @@

11branches: master

2−doctest: <8.10

2+doctest: True

33doctest-filter-packages: base-compat

55constraint-set text-show

http-api-data.cabal+1−1

@@ -115,7 +115,7 @@ test-suite spec

115115 build-depends: HUnit >= 1.6.0.0 && <1.7

116116 , hspec >= 2.7.1 && <2.8

117117 , QuickCheck >= 2.13.1 && <2.15

118− , quickcheck-instances >= 0.3.25.1 && <0.4

118+ , quickcheck-instances >= 0.3.25.2 && <0.4

119119

120120source-repository head

121121 type: git

src/Web/Internal/HttpApiData.hs+1−1

@@ -778,7 +778,7 @@ instance FromHttpApiData QuarterOfYear where

778778 "q1" -> return Q1

779779 "q2" -> return Q2

780780 "q3" -> return Q3

781− "e4 " -> return Q4

781+ "q4" -> return Q4

782782 _ -> Left "Invalid quarter of year"

783783

784784instance FromHttpApiData All where parseUrlPiece = coerce (parseUrlPiece :: Text -> Either Text Bool)