From aa553280e2751365ab81b683eace57ceb24d171a Mon Sep 17 00:00:00 2001 From: ncaq Date: Thu, 16 Jan 2025 12:58:50 +0900 Subject: [PATCH 1/4] fix: allow base version from GHC 9.12 --- hiedb.cabal | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hiedb.cabal b/hiedb.cabal index 27c2577..c812e22 100644 --- a/hiedb.cabal +++ b/hiedb.cabal @@ -22,6 +22,7 @@ tested-with: GHC ==9.0.2 || ==9.6.5 || ==9.8.2 || ==9.10.1 + || ==9.12.1 source-repository head type: git @@ -29,7 +30,7 @@ source-repository head common common-options default-language: Haskell2010 - build-depends: base >= 4.12 && < 4.21 + build-depends: base >= 4.12 && < 4.22 ghc-options: -Wall -Wcompat -Widentities @@ -60,7 +61,7 @@ library HieDb.Dump, HieDb.Html, HieDb.Run - build-depends: ghc >= 8.6 && < 9.11 + build-depends: ghc >= 8.6 && < 9.13 , array , containers , filepath From 15c81a1dcc09e15642ec53ce55fe53e99f0f8345 Mon Sep 17 00:00:00 2001 From: ncaq Date: Thu, 16 Jan 2025 13:26:38 +0900 Subject: [PATCH 2/4] ci: `haskell-ci regenerate` --- .github/workflows/haskell-ci.yml | 40 ++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 8f545f8..91a715d 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.20240608 +# version: 0.19.20250115 # -# REGENDATA ("0.19.20240608",["github","cabal.project"]) +# REGENDATA ("0.19.20250115",["github","cabal.project"]) # name: Haskell-CI on: @@ -28,6 +28,11 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.12.1 + compilerKind: ghc + compilerVersion: 9.12.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.10.1 compilerKind: ghc compilerVersion: 9.10.1 @@ -60,15 +65,29 @@ jobs: allow-failure: false fail-fast: false steps: - - name: apt + - name: apt-get install run: | apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + - name: Install GHCup + run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.22.0/x86_64-linux-ghcup-0.1.22.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + - 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" + - name: Install GHC (GHCup) + if: matrix.setup-method == 'ghcup' + run: | + "$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 }} @@ -79,21 +98,12 @@ jobs: echo "LANG=C.UTF-8" >> "$GITHUB_ENV" echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" - HCDIR=/opt/$HCKIND/$HCVER - 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" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" echo "HEADHACKAGE=false" >> "$GITHUB_ENV" echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" - echo "GHCJSARITH=0" >> "$GITHUB_ENV" env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -210,8 +220,8 @@ jobs: rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache - uses: actions/cache/save@v4 if: always() + uses: actions/cache/save@v4 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store From 1bec689263ebe7c5b7a91ae11850de3a2da31a09 Mon Sep 17 00:00:00 2001 From: ncaq Date: Thu, 16 Jan 2025 13:16:05 +0900 Subject: [PATCH 3/4] docs: update changelog for version 0.6.0.2 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dee2c1b..37a1f41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for hiedb +## 0.6.0.2 + +* Bump base and ghc version bounds to support GHC 9.12 + ## 0.6.0.1 * Bump base and ghc version bounds to support GHC 9.10 From 5a276d17940bd3bbe3fee2370e206431be82d6e5 Mon Sep 17 00:00:00 2001 From: ncaq Date: Thu, 16 Jan 2025 13:15:44 +0900 Subject: [PATCH 4/4] chore: bump version to 0.6.0.2 --- hiedb.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hiedb.cabal b/hiedb.cabal index c812e22..dc334df 100644 --- a/hiedb.cabal +++ b/hiedb.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: hiedb -version: 0.6.0.1 +version: 0.6.0.2 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