Skip to content
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
34 changes: 23 additions & 11 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.20250315
# version: 0.19.20260331
#
# REGENDATA ("0.19.20250315",["github","cabal.project"])
# REGENDATA ("0.19.20260331",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -20,6 +20,11 @@ on:
pull_request:
branches:
- master
merge_group:
branches:
- master
workflow_dispatch:
{}
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand All @@ -32,14 +37,19 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.12.2
- compiler: ghc-9.14.1
compilerKind: ghc
compilerVersion: 9.14.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.12.4
compilerKind: ghc
compilerVersion: 9.12.2
compilerVersion: 9.12.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.1
- compiler: ghc-9.10.3
compilerKind: ghc
compilerVersion: 9.10.1
compilerVersion: 9.10.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
Expand Down Expand Up @@ -91,12 +101,12 @@ jobs:
- name: Install GHCup
run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.0 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install
run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -172,7 +182,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
path: source
- name: initial cabal.project for sdist
Expand All @@ -197,7 +207,9 @@ jobs:
touch cabal.project.local
echo "packages: ${PKGDIR_binary_instances}" >> cabal.project
echo "package binary-instances" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package binary-instances" >> cabal.project ; fi
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(binary-instances)$/; }' >> cabal.project.local
Expand Down
14 changes: 8 additions & 6 deletions binary-instances.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cabal-version: 2.2
name: binary-instances
version: 1.0.6
x-revision: 1
synopsis: Orphan instances for binary
description:
`binary-instances` defines orphan instances for types in some popular packages.
Expand All @@ -22,8 +23,9 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.12.2
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

extra-source-files: CHANGELOG.md

Expand All @@ -35,13 +37,13 @@ library
default-language: Haskell2010
hs-source-dirs: src
build-depends:
, base >=4.6.0.1 && <4.22
, base >=4.6.0.1 && <4.23
, binary >=0.5.1.1 && <0.8.10
, text >=1.2.3.0 && <1.3 || >=2.0 && <2.2

build-depends:
, case-insensitive >=1.2.1.0 && <1.2.2
, tagged >=0.8.8 && <0.8.10
, tagged >=0.8.8 && <0.8.11

build-depends:
, aeson ^>=2.2.2.0
Expand Down Expand Up @@ -82,8 +84,8 @@ test-suite binary-instances-test
, case-insensitive
, hashable
, primitive
, QuickCheck ^>=2.14.3 || ^>=2.15.0.1
, quickcheck-instances ^>=0.3.31
, QuickCheck ^>=2.14.3 || ^>=2.15.0.1 || ^>=2.18.0.0
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason why 2.16 / 2.17 were left out?

I just tried in Nixpkgs with 2.16, that passes tests fine. Would appreciate a hackage revision allowing that, too. Thanks!

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't do, sorry. Supporting a range of major versions is always extra work (for CI).

, quickcheck-instances ^>=0.3.31 || ^>=0.4
, scientific
, tagged
, tasty ^>=1.5
Expand Down
1 change: 1 addition & 0 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
branches: master
error-unused-packages: False
Loading