From 345e35b1ccba238aaed9193ebd5f640103e18af3 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 4 Jan 2026 21:06:57 +0200 Subject: [PATCH] Support GHC-9.14 --- .github/workflows/haskell-ci.yml | 39 +++++++++++++++++++++++++++-- cabal.project | 31 +++++++++++++++++++++++ splitmix-tests/splitmix-tests.cabal | 5 ++-- splitmix.cabal | 3 ++- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 27a0542..645de69 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20260102 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20260102",["github","cabal.project"]) +# REGENDATA ("0.19.20260104",["github","cabal.project"]) # name: Haskell-CI on: @@ -35,6 +35,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.14.1 + compilerKind: ghc + compilerVersion: 9.14.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.12.2 compilerKind: ghc compilerVersion: 9.12.2 @@ -226,6 +231,36 @@ jobs: if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package splitmix-tests" >> 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 <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index 3fef75e..8cb05dd 100644 --- a/cabal.project +++ b/cabal.project @@ -3,3 +3,34 @@ packages: splitmix-tests tests: True benchmarks: True + +allow-newer: parallel-3.3.0.0:base +allow-newer: vector-th-unbox-0.2.2:base +allow-newer: vector-th-unbox-0.2.2:template-haskell +allow-newer: microstache-1.0.3:base +allow-newer: microstache-1.0.3:containers +allow-newer: scientific-0.3.8.0:base +allow-newer: scientific-0.3.8.0:template-haskell +allow-newer: scientific-0.3.8.0:containers +allow-newer: integer-logarithms-1.0.4:base +allow-newer: integer-logarithms-1.0.4:ghc-bignum +allow-newer: binary-orphans-1.0.5:base +allow-newer: indexed-traversable-0.1.4:base +allow-newer: indexed-traversable-0.1.4:containers +allow-newer: indexed-traversable-instances-0.1.2:base +allow-newer: time-compat-1.9.8:base +allow-newer: these-1.2.1:base +allow-newer: semialign-1.3.1:base +allow-newer: semialign-1.3.1:containers +allow-newer: integer-conversion-0.1.1:base +allow-newer: aeson-2.2.3.0:base +allow-newer: aeson-2.2.3.0:template-haskell +allow-newer: aeson-2.2.3.0:containers +allow-newer: aeson-2.2.3.0:time +allow-newer: uuid-types-1.0.6:base +allow-newer: uuid-types-1.0.6:template-haskell +allow-newer: async-2.2.5:base +allow-newer: time-compat-1.9.8:time +allow-newer: text-iso8601-0.1.1:time +allow-newer: test-framework-0.8.2.2:time +allow-newer: hsc2hs-0.68.10:base diff --git a/splitmix-tests/splitmix-tests.cabal b/splitmix-tests/splitmix-tests.cabal index 9934b2f..1c882d5 100644 --- a/splitmix-tests/splitmix-tests.cabal +++ b/splitmix-tests/splitmix-tests.cabal @@ -23,6 +23,7 @@ tested-with: || ==9.8.4 || ==9.10.2 || ==9.12.2 + || ==9.14.1 library default-language: Haskell2010 @@ -42,7 +43,7 @@ benchmark comparison main-is: Bench.hs build-depends: , base <5 - , containers >=0.6.0.1 && <0.8 + , containers >=0.6.0.1 && <0.9 , criterion >=1.6.0.0 && <1.7 , random , splitmix @@ -82,7 +83,7 @@ test-suite splitmix-tests build-depends: , base <5 - , containers >=0.4.0.0 && <0.8 + , containers >=0.4.0.0 && <0.9 , HUnit >=1.6.0.0 && <1.7 , math-functions >=0.3.3.0 && <0.4 , splitmix diff --git a/splitmix.cabal b/splitmix.cabal index 6aac977..ed4d522 100644 --- a/splitmix.cabal +++ b/splitmix.cabal @@ -43,6 +43,7 @@ tested-with: || ==9.8.4 || ==9.10.2 || ==9.12.2 + || ==9.14.1 extra-doc-files: Changelog.md @@ -73,7 +74,7 @@ library -- ghc-options: -fplugin=DumpCore -fplugin-opt DumpCore:core-html build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , deepseq >=1.4.4.0 && <1.6 if flag(optimised-mixer)