Skip to content

Commit e14f043

Browse files
andreasabelandreasabel
committed
v0.1.0.4: drop unused dependencies from test-suite
1 parent 6f0f25b commit e14f043

File tree

4 files changed

+60
-10
lines changed

4 files changed

+60
-10
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250506
11+
# version: 0.19.20250821
1212
#
13-
# REGENDATA ("0.19.20250506",["github","hackage-cli.cabal"])
13+
# REGENDATA ("0.19.20250821",["github","hackage-cli.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.14.0.20250819
36+
compilerKind: ghc
37+
compilerVersion: 9.14.0.20250819
38+
setup-method: ghcup-prerelease
39+
allow-failure: false
3540
- compiler: ghc-9.12.2
3641
compilerKind: ghc
3742
compilerVersion: 9.12.2
@@ -106,8 +111,8 @@ jobs:
106111
chmod a+x "$HOME/.ghcup/bin/ghcup"
107112
- name: Install cabal-install
108113
run: |
109-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
114+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
115+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
111116
- name: Install GHC (GHCup)
112117
if: matrix.setup-method == 'ghcup'
113118
run: |
@@ -122,6 +127,21 @@ jobs:
122127
HCKIND: ${{ matrix.compilerKind }}
123128
HCNAME: ${{ matrix.compiler }}
124129
HCVER: ${{ matrix.compilerVersion }}
130+
- name: Install GHC (GHCup prerelease)
131+
if: matrix.setup-method == 'ghcup-prerelease'
132+
run: |
133+
"$HOME/.ghcup/bin/ghcup" config add-release-channel prereleases
134+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
135+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
136+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
137+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
138+
echo "HC=$HC" >> "$GITHUB_ENV"
139+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
140+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
141+
env:
142+
HCKIND: ${{ matrix.compilerKind }}
143+
HCNAME: ${{ matrix.compiler }}
144+
HCVER: ${{ matrix.compilerVersion }}
125145
- name: Set PATH and environment variables
126146
run: |
127147
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -132,7 +152,7 @@ jobs:
132152
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
133153
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
134154
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
135-
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
155+
if [ $((HCNUMVER >= 91400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
136156
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
137157
env:
138158
HCKIND: ${{ matrix.compilerKind }}
@@ -160,6 +180,18 @@ jobs:
160180
repository hackage.haskell.org
161181
url: http://hackage.haskell.org/
162182
EOF
183+
if $HEADHACKAGE; then
184+
cat >> $CABAL_CONFIG <<EOF
185+
repository head.hackage.ghc.haskell.org
186+
url: https://ghc.gitlab.haskell.org/head.hackage/
187+
secure: True
188+
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
189+
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
190+
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
191+
key-threshold: 3
192+
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
193+
EOF
194+
fi
163195
cat >> $CABAL_CONFIG <<EOF
164196
program-default-options
165197
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -208,9 +240,16 @@ jobs:
208240
touch cabal.project.local
209241
echo "packages: ${PKGDIR_hackage_cli}" >> cabal.project
210242
echo "package hackage-cli" >> cabal.project
211-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
243+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
244+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package hackage-cli" >> cabal.project ; fi
245+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
246+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package hackage-cli" >> cabal.project ; fi
247+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
212248
cat >> cabal.project <<EOF
213249
EOF
250+
if $HEADHACKAGE; then
251+
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
252+
fi
214253
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|binary|hackage-cli)$/; }' >> cabal.project.local
215254
cat cabal.project
216255
cat cabal.project.local

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog for hackage-cli
22

3+
## 0.1.0.4
4+
5+
_Andreas Abel, 2025-08-30_
6+
7+
- Remove unused dependencies of test-suite
8+
9+
Builds with `Cabal 3.4 - 3.16` and `GHC 8.2 - 9.14 alpha1`.
10+
311
## 0.1.0.3
412

513
_Andreas Abel, 2025-06-04_

‎hackage-cli.cabal‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hackage-cli
3-
version: 0.1.0.3
3+
version: 0.1.0.4
44

55
synopsis: CLI tool for Hackage
66
description:
@@ -18,6 +18,7 @@ build-type: Simple
1818
-- Supported GHC versions when building with cabal:
1919
tested-with:
2020
-- Keep in descending order.
21+
GHC == 9.14.1
2122
GHC == 9.12.2
2223
GHC == 9.10.2
2324
GHC == 9.8.4
@@ -57,7 +58,7 @@ library cabal-revisions
5758
build-depends:
5859
, base >= 4.10.0.0 && < 5
5960
, bytestring >= 0.10.4.0 && < 0.13
60-
, Cabal >= 3.4 && < 3.15
61+
, Cabal >= 3.4 && < 3.17
6162
, containers >= 0.5.0.0 && < 0.8
6263
, mtl >= 2.2.2 && < 2.3 || >= 2.3.1 && < 2.4
6364
, pretty ^>= 1.1.2
@@ -129,13 +130,11 @@ executable hackage-cli
129130
, netrc ^>= 0.2.0.0
130131
, optparse-applicative >= 0.14 && < 1
131132
, process-extras ^>= 0.7.4
132-
, semigroups >= 0.18.3 && < 0.21
133133
, stringsearch ^>= 0.3.6
134134
, tagsoup ^>= 0.14
135135
, tar >= 0.5 && < 1
136136
, text >= 1.2 && < 2.2
137137
, time >= 1.5.0.1 && < 1.15
138-
, unordered-containers ^>= 0.2.7
139138
, zlib >= 0.6.1 && < 0.8
140139

141140
ghc-options: -Wall -Wcompat -threaded

‎src/IndexShaSum.hs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
{-# LANGUAGE RecordWildCards #-}
55
{-# LANGUAGE StandaloneDeriving #-}
66

7+
#if __GLASGOW_HASKELL__ >= 900
8+
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
9+
#endif
10+
711
-- |
812
-- Module : IndexShaSum
913
-- Copyright : Herbert Valerio Riedel

0 commit comments

Comments
 (0)