From 3c95d56f8f72fc2c05f4f0c80b545905d75640d7 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 7 Jan 2026 08:24:37 +0100 Subject: [PATCH 1/3] Relax time upper bound to <2 --- .github/workflows/haskell-ci.yml | 36 ++++++++++++++++++++------------ MissingH.cabal | 10 +++++---- cabal.haskell-ci | 1 + 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index cda60de..ed4b761 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.20250216 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20250216",["github","MissingH.cabal"]) +# REGENDATA ("0.19.20260104",["github","MissingH.cabal"]) # 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 }} @@ -32,14 +35,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.2 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.12.2 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 @@ -47,9 +55,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.6 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.6 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -106,12 +114,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.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: | @@ -187,7 +195,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 @@ -212,7 +220,9 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_MissingH}" >> cabal.project if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package MissingH" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package MissingH" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/MissingH.cabal b/MissingH.cabal index 3599f5e..ee4614c 100644 --- a/MissingH.cabal +++ b/MissingH.cabal @@ -1,6 +1,7 @@ cabal-version: 1.24 name: MissingH version: 1.6.0.2 +x-revision: 1 build-type: Simple license: BSD3 @@ -10,10 +11,11 @@ maintainer: Andreas Abel license-file: LICENSE tested-with: - GHC == 9.12.1 - GHC == 9.10.1 + GHC == 9.14.1 + GHC == 9.12.2 + GHC == 9.10.3 GHC == 9.8.4 - GHC == 9.6.6 + GHC == 9.6.7 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -139,7 +141,7 @@ library , parsec == 3.1.* && (< 3.1.12 || >= 3.1.13) , process >= 1.1.0.1 && < 1.7 , regex-compat >= 0.95.1 && < 0.96 - , time >= 1.4 && < 1.15 + , time >= 1.4 && < 2 if flag(network--GE-3_0_0) build-depends: network-bsd >= 2.8.1 && <2.9, diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 34455eb..6deb08a 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,5 +1,6 @@ branches: master installed: +all +error-incomplete-patterns: False -- constraint-set containers-0.7 -- ghc: >= 8.2 From 57f7c5689c01f5d84ecdce717716c8658aa4024c Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 7 Jan 2026 08:39:11 +0100 Subject: [PATCH 2/3] Bump ci-mac-win.yml to GHC 9.14 --- .github/workflows/ci-mac-win.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-mac-win.yml b/.github/workflows/ci-mac-win.yml index 902e350..61478eb 100644 --- a/.github/workflows/ci-mac-win.yml +++ b/.github/workflows/ci-mac-win.yml @@ -21,11 +21,11 @@ jobs: fail-fast: false matrix: os: [windows-latest, macos-latest] - ghc: ['9.10', '9.8', '9.6', '9.4'] + ghc: ['9.14', '9.12', '9.10'] # Minor versions are determined by setup-haskell. # Use quotes so that the version numbers are not interpreted as floats. include: - - os: macos-13 + - os: macos-15-intel ghc: '8.0' - os: windows-latest ghc: '8.4' @@ -33,7 +33,7 @@ jobs: # see https://github.com/haskell/hsc2hs/issues/81 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: haskell-actions/setup@v2 id: setup-haskell @@ -63,7 +63,7 @@ jobs: run: | cabal configure -O0 --enable-tests --enable-benchmarks - - uses: actions/cache@v4 + - uses: actions/cache@v5 name: Cache dependencies id: cache env: From c9b8db87432eb35c580f06c6e6645a7070ba0946 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 7 Jan 2026 08:47:50 +0100 Subject: [PATCH 3/3] Drop unused dependency 'time' from testsuite --- CHANGES.md | 7 +++++++ MissingH.cabal | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3f07d1c..db193ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +# 1.6.0.3 + +_Andreas Abel, 2026-01-07_ + +- Allow `time < 2` +- Tested with GHC 8.0 - 9.14.1 + # 1.6.0.2 _Andreas Abel, 2025-03-02_ diff --git a/MissingH.cabal b/MissingH.cabal index ee4614c..fadb599 100644 --- a/MissingH.cabal +++ b/MissingH.cabal @@ -1,7 +1,6 @@ cabal-version: 1.24 name: MissingH -version: 1.6.0.2 -x-revision: 1 +version: 1.6.0.3 build-type: Simple license: BSD3 @@ -201,7 +200,6 @@ test-suite runtests , old-time , parsec , regex-compat - , time if !os(windows) build-depends: unix