Skip to content

Commit 23db49b

Browse files
committed
Update CI
1 parent b423edc commit 23db49b

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 15 additions & 8 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.20250330
11+
# version: 0.19.20260104
1212
#
13-
# REGENDATA ("0.19.20250330",["github","cabal.project"])
13+
# REGENDATA ("0.19.20260104",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,6 +20,9 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
2326
jobs:
2427
linux:
2528
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -95,8 +98,8 @@ jobs:
9598
chmod a+x "$HOME/.ghcup/bin/ghcup"
9699
- name: Install cabal-install
97100
run: |
98-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
99-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
101+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
100103
- name: Install GHC (GHCup)
101104
if: matrix.setup-method == 'ghcup'
102105
run: |
@@ -174,14 +177,14 @@ jobs:
174177
- name: install cabal-docspec
175178
run: |
176179
mkdir -p $HOME/.cabal/bin
177-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
178-
echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c -
180+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz
181+
echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c -
179182
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
180183
rm -f cabal-docspec.xz
181184
chmod a+x $HOME/.cabal/bin/cabal-docspec
182185
cabal-docspec --version
183186
- name: checkout
184-
uses: actions/checkout@v4
187+
uses: actions/checkout@v5
185188
with:
186189
path: source
187190
- name: initial cabal.project for sdist
@@ -206,7 +209,11 @@ jobs:
206209
touch cabal.project.local
207210
echo "packages: ${PKGDIR_http_api_data}" >> cabal.project
208211
echo "package http-api-data" >> cabal.project
209-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
212+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
213+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package http-api-data" >> cabal.project ; fi
214+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
215+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package http-api-data" >> cabal.project ; fi
216+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
210217
cat >> cabal.project <<EOF
211218
EOF
212219
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local

http-api-data.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.12
22
name: http-api-data
3-
version: 0.6.2
3+
version: 0.6.2.1
44

55
synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.
66
category: Web
@@ -47,7 +47,6 @@ library
4747
, bytestring >= 0.10.8.2 && < 0.13
4848
, containers >= 0.6.0.1 && < 0.8
4949
, text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.2
50-
, transformers >= 0.5.6.2 && < 0.7
5150

5251
-- other-dependencies
5352
build-depends:

0 commit comments

Comments
 (0)