Skip to content

Commit 81bcf1c

Browse files
authored
Merge pull request #510 from Shimuuar/ghc912-support
Support for GHC-9.12
2 parents 3322046 + b74c335 commit 81bcf1c

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,39 @@ jobs:
1818
matrix:
1919
include:
2020
# Linux
21-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.0.2" }
22-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.2.2" }
23-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.4.4" }
24-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.6.5" }
25-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.8.4" }
26-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "8.10.7" }
27-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.0.2" }
28-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.2.8" }
29-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.4.8" }
30-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5" }
31-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.6.5",
21+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.0.2" }
22+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.2.2" }
23+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.4.4" }
24+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.6.5" }
25+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.8.4" }
26+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "8.10.7" }
27+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.0.2" }
28+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.2.8" }
29+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.4.8" }
30+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.6.6" }
31+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.6.6",
3232
flags: "-fUnsafeChecks -fInternalChecks" }
33-
- { cabal: "3.10", os: ubuntu-22.04, ghc: "9.8.2" }
33+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.8.2" }
34+
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.10.1" }
3435
# Win
35-
- { cabal: "3.10", os: windows-latest, ghc: "8.4.4" }
36+
- { cabal: "3.12", os: windows-latest, ghc: "8.4.4" }
3637
# OOM when building tests
3738
# - { cabal: "3.6", os: windows-latest, ghc: "8.6.5" }
3839
# - { cabal: "3.6", os: windows-latest, ghc: "8.8.4" }
3940
# - { cabal: "3.6", os: windows-latest, ghc: "8.10.4" }
4041
# Too flaky:
4142
# - { cabal: "3.6", os: windows-latest, ghc: "9.0.1" }
4243
# MacOS
43-
- { cabal: "3.10", os: macOS-13, ghc: "8.4.4" }
44-
- { cabal: "3.10", os: macOS-13, ghc: "8.6.5" }
45-
- { cabal: "3.10", os: macOS-13, ghc: "8.8.4" }
46-
- { cabal: "3.10", os: macOS-13, ghc: "8.10.7" }
47-
- { cabal: "3.10", os: macOS-13, ghc: "9.0.2" }
48-
- { cabal: "3.10", os: macOS-latest, ghc: "9.2.8" }
49-
- { cabal: "3.10", os: macOS-latest, ghc: "9.4.8" }
50-
- { cabal: "3.10", os: macOS-latest, ghc: "9.6.5" }
51-
- { cabal: "3.10", os: macOS-latest, ghc: "9.8.2" }
44+
- { cabal: "3.12", os: macOS-13, ghc: "8.4.4" }
45+
- { cabal: "3.12", os: macOS-13, ghc: "8.6.5" }
46+
- { cabal: "3.12", os: macOS-13, ghc: "8.8.4" }
47+
- { cabal: "3.12", os: macOS-13, ghc: "8.10.7" }
48+
- { cabal: "3.12", os: macOS-13, ghc: "9.0.2" }
49+
- { cabal: "3.12", os: macOS-latest, ghc: "9.2.8" }
50+
- { cabal: "3.12", os: macOS-latest, ghc: "9.4.8" }
51+
- { cabal: "3.12", os: macOS-latest, ghc: "9.6.6" }
52+
- { cabal: "3.12", os: macOS-latest, ghc: "9.8.2" }
53+
- { cabal: "3.12", os: macOS-latest, ghc: "9.10.1" }
5254
fail-fast: false
5355

5456
steps:

vector-stream/vector-stream.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Library
4949
Hs-Source-Dirs:
5050
src
5151

52-
Build-Depends: base >= 4.9 && < 4.21
52+
Build-Depends: base >= 4.9 && < 4.22
5353
, ghc-prim >= 0.2 && < 0.12
5454

5555
source-repository head

vector/vector.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Library
160160
Install-Includes:
161161
vector.h
162162

163-
Build-Depends: base >= 4.9 && < 4.21
163+
Build-Depends: base >= 4.9 && < 4.22
164164
, primitive >= 0.6.4.0 && < 0.10
165165
, deepseq >= 1.1 && < 1.6
166166
, vector-stream >= 0.1 && < 0.2

0 commit comments

Comments
 (0)