Skip to content

Commit 11828d2

Browse files
committed
bump serialise dep version for vector 0.13 and disable on older GHC where it is unsupported
1 parent 2dfa793 commit 11828d2

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
touch cabal.project
178178
echo "packages: $GITHUB_WORKSPACE/source/strict-containers" >> cabal.project
179179
echo "packages: $GITHUB_WORKSPACE/source/strict-containers-lens" >> cabal.project
180-
echo "packages: $GITHUB_WORKSPACE/source/strict-containers-serialise" >> cabal.project
180+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-containers-serialise" >> cabal.project ; fi
181181
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/strict-containers-tests" >> cabal.project ; fi
182182
cat cabal.project
183183
- name: sdist
@@ -203,14 +203,14 @@ jobs:
203203
touch cabal.project.local
204204
echo "packages: ${PKGDIR_strict_containers}" >> cabal.project
205205
echo "packages: ${PKGDIR_strict_containers_lens}" >> cabal.project
206-
echo "packages: ${PKGDIR_strict_containers_serialise}" >> cabal.project
206+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_containers_serialise}" >> cabal.project ; fi
207207
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then echo "packages: ${PKGDIR_strict_containers_tests}" >> cabal.project ; fi
208208
echo "package strict-containers" >> cabal.project
209209
echo " ghc-options: -Werror=missing-methods" >> cabal.project
210210
echo "package strict-containers-lens" >> cabal.project
211211
echo " ghc-options: -Werror=missing-methods" >> cabal.project
212-
echo "package strict-containers-serialise" >> cabal.project
213-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
212+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "package strict-containers-serialise" >> cabal.project ; fi
213+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
214214
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then echo "package strict-containers-tests" >> cabal.project ; fi
215215
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
216216
cat >> cabal.project <<EOF
@@ -243,8 +243,8 @@ jobs:
243243
${CABAL} -vnormal check
244244
cd ${PKGDIR_strict_containers_lens} || false
245245
${CABAL} -vnormal check
246-
cd ${PKGDIR_strict_containers_serialise} || false
247-
${CABAL} -vnormal check
246+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then cd ${PKGDIR_strict_containers_serialise} || false ; fi
247+
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
248248
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then cd ${PKGDIR_strict_containers_tests} || false ; fi
249249
if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
250250
- name: haddock

strict-containers-lens/strict-containers-lens.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ library
3030
build-depends:
3131
base >= 4.5.0.0 && < 5
3232
, hashable >= 1.2.7.0 && < 1.5
33-
, strict-containers >= 0.1
33+
, strict-containers >= 0.2
3434
, lens >= 4.19 && < 6
3535

3636
exposed-modules:

strict-containers-serialise/strict-containers-serialise.cabal

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ Build-type: Simple
1414
extra-source-files:
1515
CHANGELOG.md
1616
tested-with:
17-
GHC ==8.2.2
18-
|| ==8.4.4
17+
GHC ==8.4.4
1918
|| ==8.6.5
2019
|| ==8.8.4
2120
|| ==8.10.7
@@ -28,11 +27,11 @@ library
2827
ghc-options: -Wall
2928

3029
build-depends:
31-
base >= 4.5.0.0 && < 5
32-
, cborg >= 0.2 && < 0.3
33-
, hashable >= 1.2.7.0 && < 1.5
34-
, strict-containers >= 0.1
35-
, serialise >= 0.2.3.0 && < 0.3
30+
base >= 4.11.0.0 && < 5
31+
, cborg >= 0.2 && < 0.3
32+
, hashable >= 1.2.7.0 && < 1.5
33+
, strict-containers >= 0.2
34+
, serialise >= 0.2.6.0 && < 0.3
3635

3736
exposed-modules:
3837
Data.Strict.Containers.Serialise

0 commit comments

Comments
 (0)