Skip to content

Support GHC-9.14 #68

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

Merged
phadej merged 1 commit into from
Apr 16, 2026
Merged

Support GHC-9.14 #68

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
38 changes: 26 additions & 12 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/haskell-CI/haskell-ci
#
# version: 0.19.20250104
# version: 0.19.20260331
#
# REGENDATA ("0.19.20250104",["github","cabal.project"])
# REGENDATA ("0.19.20260331",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -20,10 +20,15 @@ on:
pull_request:
branches:
- master
merge_group:
branches:
- master
workflow_dispatch:
{}
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes:
60
container:
Expand All @@ -32,14 +37,19 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.12.1
- 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.1
compilerVersion: 9.12.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.1
- compiler: ghc-9.10.2
compilerKind: ghc
compilerVersion: 9.10.1
compilerVersion: 9.10.2
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.30.0/x86_64-linux-ghcup-0.1.30.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.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -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,11 @@ jobs:
touch cabal.project.local
echo "packages: ${PKGDIR_binary_orphans}" >> cabal.project
echo "package binary-orphans" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package binary-orphans" >> cabal.project ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package binary-orphans" >> 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-orphans)$/; }' >> cabal.project.local
Expand Down
18 changes: 8 additions & 10 deletions binary-orphans.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cabal-version: 1.12
name: binary-orphans
version: 1.0.5
x-revision: 1
version: 1.0.5.1
synopsis: Compatibility package for binary; provides instances
category: Data, Binary, Parsing, Compatibility
description:
Expand All @@ -24,8 +23,9 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.12.1
|| ==9.10.2
|| ==9.12.4
|| ==9.14.1

extra-source-files: CHANGELOG.md

Expand All @@ -40,8 +40,8 @@ library
exposed-modules: Data.Binary.Orphans
other-extensions: CPP
build-depends:
base >=4.12.0.0 && <4.22
, binary >=0.8.6.0 && <0.8.10
base >=4.12.0.0 && <4.23
, binary >=0.8.6.0 && <0.8.10

if !impl(ghc >=9.2)
build-depends: OneTuple >=0.4.2 && <0.5
Expand All @@ -59,10 +59,8 @@ test-suite binary-orphans-test
base
, binary
, binary-orphans
, OneTuple >=0.3 && <0.5
, QuickCheck >=2.13.1 && <2.16
, quickcheck-instances >=0.3.28 && <0.4
, tagged >=0.8.6 && <0.9
, QuickCheck >=2.13.1 && <2.19
, quickcheck-instances >=0.3.28 && <0.5
, tasty >=0.10.1.2 && <1.6
, tasty-quickcheck >=0.8.3.2 && <0.12

Expand Down
4 changes: 2 additions & 2 deletions test/Tests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Data.Binary.Orphans ()
import Data.Monoid (Sum)
import Data.Proxy (Proxy (..))
import Data.Semigroup (Min (..))
import Data.Tuple.Solo (Solo (..))
-- import Data.Tuple.Solo (Solo (..))
import Numeric.Natural (Natural)
import Test.QuickCheck (Property, (===))
import Test.QuickCheck.Instances ()
Expand All @@ -21,7 +21,7 @@ tests = testGroup "Roundtrip"
[ testProperty "Natural" $ roundtrip (Proxy :: Proxy Natural)
, testProperty "Sum Int" $ roundtrip (Proxy :: Proxy (Sum Int))
, testProperty "Min Int" $ roundtrip (Proxy :: Proxy (Min Int))
, testProperty "Solo Int" $ roundtrip (Proxy :: Proxy (Solo Int))
-- , testProperty "Solo Int" $ roundtrip (Proxy :: Proxy (Solo Int)) -- no Arbitrary instance (always)
, testProperty "ByteArray" $ roundtrip (Proxy :: Proxy ByteArray)
]

Expand Down
Loading