From 33e200d0f2590111710d6492f0f0eaef1fbf640b Mon Sep 17 00:00:00 2001
From: L0neGamer <benjaminbwm@gmail.com>
Date: Sat, 26 Oct 2024 16:11:33 +0100
Subject: [PATCH 1/5] bump filepath
---
ekg.cabal | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ekg.cabal b/ekg.cabal
index 79cf265..ccc1915 100644
--- a/ekg.cabal
+++ b/ekg.cabal
@@ -1,5 +1,5 @@
name: ekg
-version: 0.4.1.0
+version: 0.4.2.0
cabal-version: >=1.10
synopsis: Remote monitoring of processes
description:
@@ -70,7 +70,7 @@ library
, bytestring <1.0
, ekg-core >=0.1 && <0.2
, ekg-json >=0.1 && <0.2
- , filepath <1.5
+ , filepath <1.6
, network <3.3
, snap-core <1.1
, snap-server <1.2
From 8eb33ded7fbd5f264b40cdf2ee52c2f4d7a495e7 Mon Sep 17 00:00:00 2001
From: L0neGamer <benjaminbwm@gmail.com>
Date: Sat, 26 Oct 2024 17:57:04 +0100
Subject: [PATCH 2/5] bump base
---
ekg.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ekg.cabal b/ekg.cabal
index ccc1915..1dbfa8d 100644
--- a/ekg.cabal
+++ b/ekg.cabal
@@ -66,7 +66,7 @@ library
build-depends:
aeson >=0.4 && <1.6 || >=2.0 && <2.3
- , base >=4.5 && <4.20
+ , base >=4.5 && <4.21
, bytestring <1.0
, ekg-core >=0.1 && <0.2
, ekg-json >=0.1 && <0.2
From b898689fb2bd80e60b6b547923aae6f9b4251cae Mon Sep 17 00:00:00 2001
From: L0neGamer <benjaminbwm@gmail.com>
Date: Sat, 26 Oct 2024 17:58:37 +0100
Subject: [PATCH 3/5] add 9.10.1 to the list
---
ekg.cabal | 1 +
1 file changed, 1 insertion(+)
diff --git a/ekg.cabal b/ekg.cabal
index 1dbfa8d..c516854 100644
--- a/ekg.cabal
+++ b/ekg.cabal
@@ -51,6 +51,7 @@ tested-with:
|| ==9.6.4
|| ==9.6.6
|| ==9.8.2
+ || ==9.10.1
library
exposed-modules:
From 79a03e54cd5faf62d34530dceeeb4dbd59ef58cf Mon Sep 17 00:00:00 2001
From: L0neGamer <benjaminbwm@gmail.com>
Date: Sun, 27 Oct 2024 14:37:40 +0000
Subject: [PATCH 4/5] update actions
---
.github/workflows/haskell-ci.yml | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index f55569f..4f190e3 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.18.1
+# version: 0.19.20240708
#
-# REGENDATA ("0.18.1",["github","ekg.cabal"])
+# REGENDATA ("0.19.20240708",["github","ekg.cabal"])
#
name: Haskell-CI
on:
@@ -28,11 +28,21 @@ jobs:
strategy:
matrix:
include:
+ - compiler: ghc-9.10.1
+ compilerKind: ghc
+ compilerVersion: 9.10.1
+ setup-method: ghcup
+ allow-failure: false
- compiler: ghc-9.8.2
compilerKind: ghc
compilerVersion: 9.8.2
setup-method: ghcup
allow-failure: false
+ - compiler: ghc-9.6.6
+ compilerKind: ghc
+ compilerVersion: 9.6.6
+ setup-method: ghcup
+ allow-failure: false
- compiler: ghc-9.6.4
compilerKind: ghc
compilerVersion: 9.6.4
@@ -90,10 +100,10 @@ jobs:
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
mkdir -p "$HOME/.ghcup/bin"
- curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.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)
- "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
@@ -111,7 +121,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
- echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$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"
@@ -168,7 +178,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist
@@ -196,7 +206,7 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
- $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(ekg)$/; }' >> cabal.project.local
+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(ekg)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
- name: dump install plan
@@ -204,7 +214,7 @@ jobs:
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
- uses: actions/cache/restore@v3
+ uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
@@ -231,7 +241,7 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
- uses: actions/cache/save@v3
+ uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
From a9e79d44465940a4f100dd936847c0345c0d3a2d Mon Sep 17 00:00:00 2001
From: L0neGamer <benjaminbwm@gmail.com>
Date: Sun, 27 Oct 2024 14:43:53 +0000
Subject: [PATCH 5/5] update changelog
---
CHANGES.md | 3 +++
ekg.cabal | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1100561..22aa71e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,6 @@
+## 0.4.1.1 (2024-10-27)
+ * Support GHC 9.10
+
## 0.4.1.0 (2024-07-31)
* Support various newer GHCs by expanding bounds.
diff --git a/ekg.cabal b/ekg.cabal
index c516854..e8a4cbb 100644
--- a/ekg.cabal
+++ b/ekg.cabal
@@ -1,5 +1,5 @@
name: ekg
-version: 0.4.2.0
+version: 0.4.1.1
cabal-version: >=1.10
synopsis: Remote monitoring of processes
description: