From f76acebd3272b065dfac1edd1e3dc1343d267624 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Wed, 17 Sep 2025 13:51:32 +0300 Subject: [PATCH 1/2] GHC-9.14 alpha2 --- .github/workflows/haskell-ci.yml | 24 ++++++++++++++++++++++-- splitmix.cabal | 5 +++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 7995947..435b379 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -32,14 +32,19 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.14.0.20250908 + compilerKind: ghc + compilerVersion: 9.14.0.20250908 + setup-method: ghcup-prerelease + allow-failure: false - compiler: ghc-9.12.2 compilerKind: ghc compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.2 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.2 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -112,6 +117,21 @@ jobs: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} HCVER: ${{ matrix.compilerVersion }} + - name: Install GHC (GHCup prerelease) + if: matrix.setup-method == 'ghcup-prerelease' + run: | + "$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} - name: Set PATH and environment variables run: | echo "$HOME/.cabal/bin" >> $GITHUB_PATH diff --git a/splitmix.cabal b/splitmix.cabal index 6c198b4..d822c85 100644 --- a/splitmix.cabal +++ b/splitmix.cabal @@ -41,8 +41,9 @@ tested-with: || ==9.4.8 || ==9.6.7 || ==9.8.4 - || ==9.10.2 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 extra-doc-files: Changelog.md @@ -74,7 +75,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) From 5b0d630d70ba8b1f0e617a1f62019d12b314c1ef Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Wed, 17 Sep 2025 13:56:14 +0300 Subject: [PATCH 2/2] WIP --- .github/workflows/haskell-ci.yml | 8 ++++++-- cabal.project | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 435b379..ebddde4 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.20250916 +# version: 0.19.20250917 # -# REGENDATA ("0.19.20250916",["github","cabal.project"]) +# REGENDATA ("0.19.20250917",["github","cabal.project"]) # name: Haskell-CI on: @@ -20,6 +20,9 @@ on: pull_request: branches: - master + merge_group: + branches: + - master jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -233,6 +236,7 @@ jobs: if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package splitmix" >> 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 0f166c7..137c2ab 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,5 @@ packages: . tests: True + +allow-newer: tagged-0.8.9:template-haskell