Skip to content

Commit b0dcf7a

Browse files
arybczakarybczak
committed
Test with GHC 9.12
1 parent 20de877 commit b0dcf7a

File tree

4 files changed

+40
-30
lines changed

4 files changed

+40
-30
lines changed

‎.github/workflows/haskell-ci.yml

+36-25
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.20240708
11+
# version: 0.19.20241219
1212
#
13-
# REGENDATA ("0.19.20240708",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20241219",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -38,14 +38,19 @@ jobs:
3838
strategy:
3939
matrix:
4040
include:
41+
- compiler: ghc-9.12.1
42+
compilerKind: ghc
43+
compilerVersion: 9.12.1
44+
setup-method: ghcup
45+
allow-failure: false
4146
- compiler: ghc-9.10.1
4247
compilerKind: ghc
4348
compilerVersion: 9.10.1
4449
setup-method: ghcup
4550
allow-failure: false
46-
- compiler: ghc-9.8.2
51+
- compiler: ghc-9.8.4
4752
compilerKind: ghc
48-
compilerVersion: 9.8.2
53+
compilerVersion: 9.8.4
4954
setup-method: ghcup
5055
allow-failure: false
5156
- compiler: ghc-9.6.6
@@ -75,15 +80,30 @@ jobs:
7580
allow-failure: false
7681
fail-fast: false
7782
steps:
78-
- name: apt
83+
- name: apt-get install
7984
run: |
8085
apt-get update
8186
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
87+
- name: Install GHCup
88+
run: |
8289
mkdir -p "$HOME/.ghcup/bin"
8390
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8491
chmod a+x "$HOME/.ghcup/bin/ghcup"
92+
- name: Install cabal-install (prerelease)
93+
run: |
94+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
95+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
96+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
97+
- name: Install GHC (GHCup)
98+
if: matrix.setup-method == 'ghcup'
99+
run: |
85100
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
86-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
102+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
103+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
104+
echo "HC=$HC" >> "$GITHUB_ENV"
105+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
106+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
87107
env:
88108
HCKIND: ${{ matrix.compilerKind }}
89109
HCNAME: ${{ matrix.compiler }}
@@ -94,21 +114,12 @@ jobs:
94114
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
95115
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
96116
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
97-
HCDIR=/opt/$HCKIND/$HCVER
98-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
99-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
100-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
101-
echo "HC=$HC" >> "$GITHUB_ENV"
102-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
103-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
104-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
105117
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
106118
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
107119
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
108120
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
109121
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
110122
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
111-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
112123
env:
113124
HCKIND: ${{ matrix.compilerKind }}
114125
HCNAME: ${{ matrix.compiler }}
@@ -164,8 +175,8 @@ jobs:
164175
- name: initial cabal.project for sdist
165176
run: |
166177
touch cabal.project
167-
echo "packages: $GITHUB_WORKSPACE/source/consumers" >> cabal.project
168178
echo "packages: $GITHUB_WORKSPACE/source/consumers-metrics-prometheus" >> cabal.project
179+
echo "packages: $GITHUB_WORKSPACE/source/consumers" >> cabal.project
169180
cat cabal.project
170181
- name: sdist
171182
run: |
@@ -177,22 +188,22 @@ jobs:
177188
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
178189
- name: generate cabal.project
179190
run: |
180-
PKGDIR_consumers="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/consumers-[0-9.]*')"
181-
echo "PKGDIR_consumers=${PKGDIR_consumers}" >> "$GITHUB_ENV"
182191
PKGDIR_consumers_metrics_prometheus="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/consumers-metrics-prometheus-[0-9.]*')"
183192
echo "PKGDIR_consumers_metrics_prometheus=${PKGDIR_consumers_metrics_prometheus}" >> "$GITHUB_ENV"
193+
PKGDIR_consumers="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/consumers-[0-9.]*')"
194+
echo "PKGDIR_consumers=${PKGDIR_consumers}" >> "$GITHUB_ENV"
184195
rm -f cabal.project cabal.project.local
185196
touch cabal.project
186197
touch cabal.project.local
187-
echo "packages: ${PKGDIR_consumers}" >> cabal.project
188198
echo "packages: ${PKGDIR_consumers_metrics_prometheus}" >> cabal.project
189-
echo "package consumers" >> cabal.project
190-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
199+
echo "packages: ${PKGDIR_consumers}" >> cabal.project
191200
echo "package consumers-metrics-prometheus" >> cabal.project
192201
echo " ghc-options: -Werror=missing-methods" >> cabal.project
202+
echo "package consumers" >> cabal.project
203+
echo " ghc-options: -Werror=missing-methods" >> cabal.project
193204
cat >> cabal.project <<EOF
194205
EOF
195-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(consumers|consumers-metrics-prometheus)$/; }' >> cabal.project.local
206+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(consumers|consumers-metrics-prometheus)$/; }' >> cabal.project.local
196207
cat cabal.project
197208
cat cabal.project.local
198209
- name: dump install plan
@@ -220,10 +231,10 @@ jobs:
220231
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
221232
- name: cabal check
222233
run: |
223-
cd ${PKGDIR_consumers} || false
224-
${CABAL} -vnormal check
225234
cd ${PKGDIR_consumers_metrics_prometheus} || false
226235
${CABAL} -vnormal check
236+
cd ${PKGDIR_consumers} || false
237+
${CABAL} -vnormal check
227238
- name: haddock
228239
run: |
229240
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
@@ -232,8 +243,8 @@ jobs:
232243
rm -f cabal.project.local
233244
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
234245
- name: save cache
235-
uses: actions/cache/save@v4
236246
if: always()
247+
uses: actions/cache/save@v4
237248
with:
238249
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
239250
path: ~/.cabal/store

‎consumers-metrics-prometheus/consumers-metrics-prometheus.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: Andrzej Rybczak <[email protected]>,
1616
copyright: Scrive AB
1717
category: Concurrency, Database
1818
build-type: Simple
19-
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.2, 9.10.1 }
19+
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.1 }
2020

2121
bug-reports: https://github.com/scrive/consumers/issues
2222
source-repository head

‎consumers/consumers.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ maintainer: Andrzej Rybczak <[email protected]>,
1717
copyright: Scrive AB
1818
category: Concurrency, Database
1919
build-type: Simple
20-
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.2, 9.10.1 }
20+
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.1 }
2121

2222
bug-reports: https://github.com/scrive/consumers/issues
2323
source-repository head

‎consumers/src/Database/PostgreSQL/Consumers/Utils.hs

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import Control.Monad.Catch
1616
import Control.Monad.Trans.Control
1717
import Data.Maybe
1818
import Data.Text qualified as T
19-
import Data.Typeable
2019
import Database.PostgreSQL.PQTypes.Class
2120
import Database.PostgreSQL.PQTypes.SQL.Raw
2221

@@ -36,15 +35,15 @@ finalize m action = do
3635
-- All exceptions other than 'StopExecution' thrown to threads spawned by
3736
-- 'forkP' and 'gforkP' are propagated back to the parent thread.
3837
data StopExecution = StopExecution
39-
deriving (Show, Typeable)
38+
deriving (Show)
4039

4140
instance Exception StopExecution where
4241
toException = E.asyncExceptionToException
4342
fromException = E.asyncExceptionFromException
4443

4544
-- | Exception thrown from a child thread.
4645
data ThrownFrom = ThrownFrom String SomeException
47-
deriving (Show, Typeable)
46+
deriving (Show)
4847

4948
instance Exception ThrownFrom
5049

0 commit comments

Comments
 (0)