Skip to content

Commit e628858

Browse files
jorisdraldcoutts
authored andcommitted
Allow GHC from 8.10 up to 9.10, update GHA matrix
1 parent e8fd52f commit e628858

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.github/workflows/haskell.yml

+15-12
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,28 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
ghc: ["9.2.8", "9.4.8", "9.6.4", "9.8.2"]
26-
cabal: ["3.10.2.1"]
25+
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.5", "9.8.2", "9.10.1"]
26+
cabal: ["3.10.3.0"]
2727
os: [ubuntu-latest] # ubuntu-latest = ubuntu-22.04
28-
liburing: ["liburing-2.5"]
28+
liburing: ["liburing-2.6"]
2929
include:
30-
- ghc: "9.6.4"
31-
cabal: "3.10.2.1"
30+
- ghc: "9.6.5"
31+
cabal: "3.10.3.0"
3232
os: ubuntu-20.04
3333
liburing: "liburing-2.1"
34-
- ghc: "9.6.4"
35-
cabal: "3.10.2.1"
34+
# It's weird, but at the liburing-2.1 tag, the liburing.pc file lists
35+
# a library version 2.0. From liburing-2.2 onward, the version listed
36+
# in the liburing.pc file is no longer a mismatch.
37+
- ghc: "9.6.5"
38+
cabal: "3.10.3.0"
3639
os: ubuntu-20.04
37-
liburing: "liburing-2.5"
38-
- ghc: "9.6.4"
39-
cabal: "3.10.2.1"
40+
liburing: "liburing-2.6"
41+
- ghc: "9.6.5"
42+
cabal: "3.10.3.0"
4043
os: ubuntu-22.04
4144
liburing: "liburing-2.1"
42-
- ghc: "9.6.4"
43-
cabal: "3.10.2.1"
45+
- ghc: "9.6.5"
46+
cabal: "3.10.3.0"
4447
os: ubuntu-22.04
4548
liburing: "system"
4649

blockio-uring.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ maintainer: [email protected]
2424
copyright: (c) Well-Typed LLP 2022 - 2024
2525
category: System
2626
build-type: Simple
27-
tested-with: GHC ==9.2 || ==9.4 || ==9.6 || ==9.8
27+
tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10
2828
extra-doc-files:
2929
CHANGELOG.md
3030
README.md
@@ -40,7 +40,7 @@ library
4040
System.IO.BlockIO.URingFFI
4141

4242
build-depends:
43-
base >=4.12 && <4.20
43+
, base >=4.14 && <4.21
4444
, primitive ^>=0.9
4545
, vector ^>=0.13
4646

@@ -61,8 +61,8 @@ benchmark bench
6161
, primitive
6262
, random
6363
, time
64-
, vector
6564
, unix
65+
, vector
6666

6767
pkgconfig-depends: liburing
6868
other-modules:
@@ -82,8 +82,8 @@ test-suite test
8282
, base
8383
, primitive
8484
, tasty
85-
, vector
8685
, tasty-hunit
86+
, vector
8787

8888
pkgconfig-depends: liburing
8989
other-modules:

0 commit comments

Comments
 (0)