Skip to content

Commit d49b228

Browse files
committed
bump base
1 parent 3561a6c commit d49b228

File tree

3 files changed

+25
-11
lines changed

3 files changed

+25
-11
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 19 additions & 9 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.18.1
11+
# version: 0.19.20240708
1212
#
13-
# REGENDATA ("0.18.1",["github","ekg-statsd.cabal"])
13+
# REGENDATA ("0.19.20240708",["github","ekg-statsd.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,11 +28,21 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.10.1
32+
compilerKind: ghc
33+
compilerVersion: 9.10.1
34+
setup-method: ghcup
35+
allow-failure: false
3136
- compiler: ghc-9.8.2
3237
compilerKind: ghc
3338
compilerVersion: 9.8.2
3439
setup-method: ghcup
3540
allow-failure: false
41+
- compiler: ghc-9.6.6
42+
compilerKind: ghc
43+
compilerVersion: 9.6.6
44+
setup-method: ghcup
45+
allow-failure: false
3646
- compiler: ghc-9.6.4
3747
compilerKind: ghc
3848
compilerVersion: 9.6.4
@@ -90,10 +100,10 @@ jobs:
90100
apt-get update
91101
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
92102
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
103+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
94104
chmod a+x "$HOME/.ghcup/bin/ghcup"
95105
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
97107
env:
98108
HCKIND: ${{ matrix.compilerKind }}
99109
HCNAME: ${{ matrix.compiler }}
@@ -111,7 +121,7 @@ jobs:
111121
echo "HC=$HC" >> "$GITHUB_ENV"
112122
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
113123
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115125
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
116126
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
117127
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -168,7 +178,7 @@ jobs:
168178
chmod a+x $HOME/.cabal/bin/cabal-plan
169179
cabal-plan --version
170180
- name: checkout
171-
uses: actions/checkout@v3
181+
uses: actions/checkout@v4
172182
with:
173183
path: source
174184
- name: initial cabal.project for sdist
@@ -196,15 +206,15 @@ jobs:
196206
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
197207
cat >> cabal.project <<EOF
198208
EOF
199-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(ekg-statsd)$/; }' >> cabal.project.local
209+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(ekg-statsd)$/; }' >> cabal.project.local
200210
cat cabal.project
201211
cat cabal.project.local
202212
- name: dump install plan
203213
run: |
204214
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
205215
cabal-plan
206216
- name: restore cache
207-
uses: actions/cache/restore@v3
217+
uses: actions/cache/restore@v4
208218
with:
209219
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
210220
path: ~/.cabal/store
@@ -231,7 +241,7 @@ jobs:
231241
rm -f cabal.project.local
232242
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
233243
- name: save cache
234-
uses: actions/cache/save@v3
244+
uses: actions/cache/save@v4
235245
if: always()
236246
with:
237247
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 0.2.6.1 (2024-10-27)
2+
* Support GHC 9.10
3+
14
## 0.2.6.0 (2024-07-31)
25

36
* Support GHC 9.0 through 9.8.

ekg-statsd.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: ekg-statsd
2-
version: 0.2.6.0
2+
version: 0.2.6.1
33
synopsis: Push metrics to statsd
44
description:
55
This library lets you push system metrics to a statsd server.
@@ -30,11 +30,12 @@ tested-with:
3030
|| ==9.6.4
3131
|| ==9.6.6
3232
|| ==9.8.2
33+
|| ==9.10.1
3334

3435
library
3536
exposed-modules: System.Remote.Monitoring.Statsd
3637
build-depends:
37-
base >=4.6 && <4.20
38+
base >=4.6 && <4.21
3839
, bytestring <1.0
3940
, ekg-core >=0.1 && <1.0
4041
, network <3.3

0 commit comments

Comments
 (0)