Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -178,7 +184,11 @@ 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 <<EOF
allow-newer: hie-compat:base
EOF
Expand Down
1 change: 0 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
packages: .
allow-newer: hie-compat:base

9 changes: 5 additions & 4 deletions hiedb.cabal
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,16 +21,17 @@ 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
location: https://github.com/wz1000/HieDb

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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 <no location info>"
, " Details: Just Bool -> Bool {usage}"
, "Types:"
Expand Down
Loading