Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.2.0.2-r3: allow containers-0.7 #25

Merged
merged 1 commit into from
Sep 29, 2023
Merged

v0.2.0.2-r3: allow containers-0.7 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/andreasabel/haskell-ci
#
# version: 0.17.20230911
# version: 0.17.20230928
#
# REGENDATA ("0.17.20230911",["github","resolv.cabal"])
# REGENDATA ("0.17.20230928",["github","resolv.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -32,14 +32,14 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.8.0.20230822
- compiler: ghc-9.8.0.20230919
compilerKind: ghc
compilerVersion: 9.8.0.20230822
compilerVersion: 9.8.0.20230919
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.2
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.7
Expand Down Expand Up @@ -215,6 +215,7 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package resolv" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
allow-newer: bytestring
EOF
if $HEADHACKAGE; then
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
Expand Down Expand Up @@ -256,6 +257,16 @@ jobs:
run: |
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: prepare for constraint sets
run: |
rm -f cabal.project.local
- name: constraint set latest-core-libs-Sep-2023
run: |
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all --dry-run ; fi
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all ; fi
if [ $((HCNUMVER >= 80200 && HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --constraint='containers >= 0.7' all ; fi
- name: save cache
uses: actions/cache/save@v3
if: always()
Expand Down
11 changes: 11 additions & 0 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,14 @@ ghcup-jobs: True
-- hvr ppa does not support jammy

installed: +all -binary

-- Test core libraries in versions newer than shipped with GHC
constraint-set latest-core-libs-Sep-2023
constraints: bytestring >= 0.12
constraints: containers >= 0.7
ghc: >= 8.2 && < 9.7
tests: True
run-tests: True

raw-project
allow-newer: bytestring
6 changes: 3 additions & 3 deletions resolv.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cabal-version: 2.2

name: resolv
version: 0.2.0.2
x-revision: 2
x-revision: 3

synopsis: Domain Name Service (DNS) lookup via the libresolv standard library routines
description: {
Expand Down Expand Up @@ -57,7 +57,7 @@ extra-tmp-files: autom4te.cache

tested-with:
GHC == 9.8.0
GHC == 9.6.2
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
GHC == 9.0.2
Expand Down Expand Up @@ -104,7 +104,7 @@ library
, bytestring >= 0.10.0.0 && < 0.13
-- instance IsString ByteString exists in its form since bytestring-0.10.0.0
-- see https://github.com/haskell-hvr/resolv/pull/13#issuecomment-1213876161
, containers ^>= 0.4.2.1 || ^>= 0.5 || ^>= 0.6
, containers >= 0.4.2.1 && < 0.8

ghc-options: -Wall
include-dirs: cbits
Expand Down