From 964c9f03748e385a5fcf943c649a2b5c4ab0d4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Fri, 9 Jan 2026 18:29:56 +0100 Subject: [PATCH 1/3] Prepare for release 0.8.0.0 --- .github/workflows/haskell-ci.yml | 31 +++++++++++++++++++++++-------- cabal.project | 7 ++++++- hiedb.cabal | 9 +++++---- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index bef6837..79ef3c5 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,14 +8,15 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250605 +# version: 0.19.20260104 # -# REGENDATA ("0.19.20250605",["github","cabal.project"]) +# REGENDATA ("0.19.20260104",["github","cabal.project"]) # name: Haskell-CI on: - push - pull_request + - merge_group jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -28,14 +29,19 @@ 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 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 @@ -76,8 +82,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.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: | @@ -153,7 +159,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 @@ -178,9 +184,18 @@ jobs: touch cabal.project.local echo "packages: ${PKGDIR_hiedb}" >> cabal.project echo "package hiedb" >> 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 hiedb" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + echo "package hiedb" >> cabal.project + echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project cat >> cabal.project <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index 2e6d125..ea2108e 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,8 @@ packages: . -allow-newer: hie-compat:base +allow-newer: + hie-compat:base +source-repository-package + type: git + location: https://github.com/snowleopard/alga + tag: d4e43fb42db05413459fb2df493361d5a666588a diff --git a/hiedb.cabal b/hiedb.cabal index b7b50d6..82d0c77 100644 --- a/hiedb.cabal +++ b/hiedb.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hiedb -version: 0.7.0.0 +version: 0.8.0.0 synopsis: Generates a references DB from .hie files description: Tool and library to index and query a collection of `.hie` files bug-reports: https://github.com/wz1000/HieDb/issues @@ -21,8 +21,9 @@ tested-with: GHC ==9.0.2 || ==9.4.8 || ==9.6.7 || ==9.8.4 - || ==9.10.2 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -30,7 +31,7 @@ source-repository head common common-options default-language: Haskell2010 - build-depends: base >= 4.12 && < 4.22 + build-depends: base >= 4.12 && < 4.23 ghc-options: -Wall -Wcompat -Widentities @@ -61,7 +62,7 @@ library HieDb.Dump, HieDb.Html, HieDb.Run - build-depends: ghc >= 8.6 && < 9.13 + build-depends: ghc >= 8.6 && < 9.15 , array , containers , filepath From e832550e3338c063d0e3f2a56c34aa779e043d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Fri, 9 Jan 2026 18:39:21 +0100 Subject: [PATCH 2/3] CPP to fix test --- test/Main.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Main.hs b/test/Main.hs index ccfa62e..03d8936 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -241,7 +241,11 @@ cliSpec = [ "Span: test/data/Module1.hs:10:8-10" , "Constructors: {(HsVar, HsExpr)}" , "Identifiers:" +#if MIN_VERSION_base(4,22,0) + , "Symbol:v:not:GHC.Internal.Classes:ghc-internal" +#else , "Symbol:v:not:GHC.Classes:ghc-prim" +#endif , "not defined at " , " Details: Just Bool -> Bool {usage}" , "Types:" From d9d5e47718c3ec78437a0b15c3892f4678c5a8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Hr=C4=8Dek?= Date: Tue, 20 Jan 2026 14:05:52 +0100 Subject: [PATCH 3/3] Remove no longer needed source-repository-package --- .github/workflows/haskell-ci.yml | 5 ----- cabal.project | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 79ef3c5..1bfa177 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -191,11 +191,6 @@ jobs: echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project cat >> cabal.project <> cabal.project.local cat cabal.project diff --git a/cabal.project b/cabal.project index ea2108e..6434111 100644 --- a/cabal.project +++ b/cabal.project @@ -1,8 +1,2 @@ packages: . -allow-newer: - hie-compat:base - -source-repository-package - type: git - location: https://github.com/snowleopard/alga - tag: d4e43fb42db05413459fb2df493361d5a666588a +allow-newer: hie-compat:base