Skip to content

Support GHC-9.10 #42

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 18 additions & 10 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20240501
# version: 0.19.20240514
#
# REGENDATA ("0.19.20240501",["--config=cabal.haskell-ci","github","cabal.project"])
# REGENDATA ("0.19.20240514",["--config=cabal.haskell-ci","github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -32,6 +32,11 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
Expand Down Expand Up @@ -81,7 +86,6 @@ jobs:
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
Expand Down Expand Up @@ -166,7 +170,7 @@ jobs:
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/indexed-traversable" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/indexed-traversable-instances" >> cabal.project
echo "packages: $GITHUB_WORKSPACE/source/indexed-traversable-benchmarks" >> cabal.project
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: $GITHUB_WORKSPACE/source/indexed-traversable-benchmarks" >> cabal.project ; fi
cat cabal.project
- name: sdist
run: |
Expand All @@ -189,16 +193,20 @@ jobs:
touch cabal.project.local
echo "packages: ${PKGDIR_indexed_traversable}" >> cabal.project
echo "packages: ${PKGDIR_indexed_traversable_instances}" >> cabal.project
echo "packages: ${PKGDIR_indexed_traversable_benchmarks}" >> cabal.project
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "packages: ${PKGDIR_indexed_traversable_benchmarks}" >> cabal.project ; fi
echo "package indexed-traversable" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package indexed-traversable-instances" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo "package indexed-traversable-benchmarks" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo "package indexed-traversable-benchmarks" >> cabal.project ; fi
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
allow-newer: quickcheck-instances:base
allow-newer: quickcheck-instances:containers
allow-newer: uuid-types:template-haskell
allow-newer: these:base
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(indexed-traversable|indexed-traversable-benchmarks|indexed-traversable-instances)$/; }' >> cabal.project.local
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(indexed-traversable|indexed-traversable-benchmarks|indexed-traversable-instances)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
Expand Down Expand Up @@ -226,8 +234,8 @@ jobs:
${CABAL} -vnormal check
cd ${PKGDIR_indexed_traversable_instances} || false
${CABAL} -vnormal check
cd ${PKGDIR_indexed_traversable_benchmarks} || false
${CABAL} -vnormal check
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then cd ${PKGDIR_indexed_traversable_benchmarks} || false ; fi
if [ $((HCNUMVER < 91000)) -ne 0 ] ; then ${CABAL} -vnormal check ; fi
- name: haddock
run: |
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
Expand Down
5 changes: 5 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ package indexed-traversable-instances

package indexed-traversable-benchmarks
ghc-options: -Wall

allow-newer: quickcheck-instances:base
allow-newer: quickcheck-instances:containers
allow-newer: uuid-types:template-haskell
allow-newer: these:base
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.5
|| ==9.8.2
|| ==9.10.1

source-repository head
type: git
Expand All @@ -39,7 +40,7 @@ library
default-language: Haskell2010
hs-source-dirs: src
build-depends:
base >=4.12 && <4.20
base >=4.12 && <4.21
, indexed-traversable >=0.1.4 && <0.2
, OneTuple >=0.3 && <0.5
, tagged >=0.8.6 && <0.9
Expand Down
5 changes: 3 additions & 2 deletions indexed-traversable/indexed-traversable.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.5
|| ==9.8.2
|| ==9.10.1

source-repository head
type: git
Expand All @@ -64,8 +65,8 @@ library

build-depends:
array >=0.3.0.2 && <0.6
, base >=4.12 && <4.20
, containers >=0.6.0.1 && <0.7
, base >=4.12 && <4.21
, containers >=0.6.0.1 && <0.8
, transformers >=0.5.6.0 && <0.7

if !impl(ghc >=9.6)
Expand Down