Skip to content

Commit 217e028

Browse files
Allow and test with 8.10.7
1 parent 3c6618d commit 217e028

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

.github/workflows/haskell-ci.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' 'cabal.project'
3+
# haskell-ci 'github' 'cabal.project' '--config' 'cabal.haskell-ci'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
@@ -10,7 +10,7 @@
1010
#
1111
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.17.20240109",["github","cabal.project"])
13+
# REGENDATA ("0.17.20240109",["github","cabal.project","--config","cabal.haskell-ci"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -48,6 +48,11 @@ jobs:
4848
compilerVersion: 9.2.8
4949
setup-method: ghcup
5050
allow-failure: false
51+
- compiler: ghc-8.10.7
52+
compilerKind: ghc
53+
compilerVersion: 8.10.7
54+
setup-method: ghcup
55+
allow-failure: false
5156
fail-fast: false
5257
steps:
5358
- name: apt
@@ -165,7 +170,7 @@ jobs:
165170
source-repository-package
166171
type: git
167172
location: https://github.com/FinleyMcIlwaine/bos-snappy
168-
tag: 373be55746d8b3c75e6e8f0a4d1dfebf3e3ad649
173+
tag: b00b103a8c522aa3adde7e922537ab6b74f73eb0
169174
EOF
170175
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(snappy-c)$/; }' >> cabal.project.local
171176
cat cabal.project
@@ -204,6 +209,15 @@ jobs:
204209
run: |
205210
rm -f cabal.project.local
206211
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
212+
- name: prepare for constraint sets
213+
run: |
214+
rm -f cabal.project.local
215+
- name: constraint set snappy
216+
run: |
217+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >=0.11' all --dry-run ; fi
218+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
219+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >=0.11' --dependencies-only -j2 all ; fi
220+
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='bytestring >=0.11' all ; fi
207221
- name: save cache
208222
uses: actions/cache/save@v3
209223
if: always()

cabal.haskell-ci

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
apt: libsnappy-dev
2+
3+
constraint-set snappy
4+
ghc: ==8.10.7
5+
constraints: bytestring >=0.11

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ packages: .
33
source-repository-package
44
type: git
55
location: https://github.com/FinleyMcIlwaine/bos-snappy
6-
tag: 373be55746d8b3c75e6e8f0a4d1dfebf3e3ad649
6+
tag: b00b103a8c522aa3adde7e922537ab6b74f73eb0

snappy-c.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ category: Codec
1717
build-type: Simple
1818
extra-source-files: README.md
1919
extra-doc-files: CHANGELOG.md
20-
tested-with: GHC==9.2.8
20+
tested-with: GHC==8.10.7
21+
, GHC==9.2.8
2122
, GHC==9.4.8
2223
, GHC==9.6.4
2324
, GHC==9.8.1
@@ -33,7 +34,7 @@ common lang
3334
-Wprepositive-qualified-module
3435
-Widentities
3536
build-depends:
36-
base >= 4.16 && < 4.20
37+
base >= 4.14 && < 4.20
3738
default-language:
3839
Haskell2010
3940
default-extensions:
@@ -101,7 +102,6 @@ executable snappy-cli
101102
-threaded
102103
-rtsopts
103104

104-
-- TODO bounds here
105105
test-suite test-snappy-c
106106
import:
107107
lang

0 commit comments

Comments
 (0)