Skip to content

Add GHC 9.10.2 & update Prometheus dependency #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PiDelport wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add GHC 9.10.2 & update Prometheus dependency #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c31ccf2
(haskell-ci regenerate)
PiDelport Aug 26, 2025
76426f2
Add GHC 9.10.2 to CI matrix
PiDelport Aug 26, 2025
4474417
Deps: Increase prometheus upper bound to allow 2.3.0
PiDelport Aug 26, 2025
38f9eef
Add CI build workaround for katip on GHC <= 9.6
PiDelport Aug 27, 2025
4a6a40b
(haskell-ci regenerate)
PiDelport Aug 27, 2025
7a40ef8
Remove unused deps: string-conv, unliftio-core
PiDelport Aug 27, 2025
5876add
Deps: Conditionalize raw-strings-qq to Darwin
PiDelport Aug 27, 2025
63bac23
Remove unused test dep: tasty-quickcheck
PiDelport Aug 27, 2025
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
22 changes: 16 additions & 6 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20250216
# version: 0.19.20250722
#
# REGENDATA ("0.19.20250216",["github","cabal.project"])
# REGENDATA ("0.19.20250722",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -28,6 +28,11 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.10.2
compilerKind: ghc
compilerVersion: 9.10.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.6
compilerKind: ghc
compilerVersion: 9.6.6
Expand All @@ -52,12 +57,12 @@ jobs:
- name: Install GHCup
run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
- 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"
"$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"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -158,9 +163,14 @@ jobs:
touch cabal.project.local
echo "packages: ${PKGDIR_ridley}" >> cabal.project
echo "package ridley" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
echo "package ridley" >> cabal.project
echo " ghc-options: -Werror=unused-packages" >> cabal.project
echo "package ridley" >> cabal.project
echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project
cat >> cabal.project <<EOF
constraints: ekg-prometheus-adapter == 0.1.0.5
constraints: katip <0.8.8.3 || >0.8.8.3
allow-newer: katip:time
allow-newer: template-haskell
allow-newer: prometheus:base
Expand Down
6 changes: 5 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ allow-newer:
wai-logger:*

constraints:
ekg-prometheus-adapter == 0.1.0.5
ekg-prometheus-adapter == 0.1.0.5,

-- katip 0.8.8.3 does not build with GHC 9.6 or below.
-- See: https://github.com/Soostone/katip/pull/160
katip <0.8.8.3 || >0.8.8.3,
12 changes: 5 additions & 7 deletions ridley.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ copyright: 2024 IRIS Connect Ltd.
category: Web
build-type: Simple
cabal-version: >=1.10
tested-with: GHC == 9.4.7 || == 9.4.8 || == 9.6.6
tested-with: GHC == 9.4.7 || == 9.4.8 || == 9.6.6 || == 9.10.2

extra-source-files:
cbits/helpers.c
Expand Down Expand Up @@ -63,17 +63,16 @@ library
shelly >= 1.8.2,
safe-exceptions < 1.8,
transformers,
prometheus > 0.5.0 && < 2.3.0,
Copy link
Contributor

@adinapoli adinapoli Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @PiDelport ! I remember adding that constraint because there were a few breaking changes in prometheus-2.3.0, but I don't remember on top of my head -- have you noticed anything out of the ordinary?

Copy link
Author

@PiDelport PiDelport Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, i did not look very deeply: i just ran the tests and checked that nothing refers directly to observeAndSample.

raw-strings-qq,
prometheus > 0.5.0 && < 2.4.0,
microlens,
microlens-th,
process,
string-conv,
ekg-prometheus-adapter >= 0.1.0.5,
inline-c,
vector,
unix,
unliftio-core
unix
if os(darwin)
build-depends: raw-strings-qq
include-dirs: cbits
c-sources: cbits/helpers.c
cc-options: -Wall -std=c99
Expand All @@ -90,7 +89,6 @@ test-suite ridley-test
, ridley
, tasty
, tasty-hunit
, tasty-quickcheck
, ekg-core
, prometheus
, containers
Expand Down