Skip to content

Commit 05741f9

Browse files
lehinslehins
authored
Merge pull request #534 from haskell/ghc-minor
Allow base-4.22
2 parents 295e250 + 3c29793 commit 05741f9

File tree

3 files changed

+32
-28
lines changed

3 files changed

+32
-28
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ jobs:
1818
matrix:
1919
include:
2020
# Linux
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",
21+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.0.2" }
22+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.2.2" }
23+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.4.4" }
24+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.6.5" }
25+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.8.4" }
26+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "8.10.7" }
27+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.0.2" }
28+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.2.8" }
29+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.4.8" }
30+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.6.7" }
31+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.6.7",
3232
flags: "-fUnsafeChecks -fInternalChecks" }
33-
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.8.4" }
34-
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.10.1" }
35-
- { cabal: "3.12", os: ubuntu-22.04, ghc: "9.12" }
33+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.8" }
34+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.10" }
35+
- { cabal: "3.12", os: ubuntu-24.04, ghc: "9.12" }
3636
# Win
3737
- { cabal: "3.12", os: windows-latest, ghc: "8.4.4" }
3838
# OOM when building tests
@@ -49,15 +49,15 @@ jobs:
4949
- { cabal: "3.12", os: macOS-13, ghc: "9.0.2" }
5050
- { cabal: "3.12", os: macOS-latest, ghc: "9.2.8" }
5151
- { cabal: "3.12", os: macOS-latest, ghc: "9.4.8" }
52-
- { cabal: "3.12", os: macOS-latest, ghc: "9.6.6" }
53-
- { cabal: "3.12", os: macOS-latest, ghc: "9.8.4" }
54-
- { cabal: "3.12", os: macOS-latest, ghc: "9.10.1" }
52+
- { cabal: "3.12", os: macOS-latest, ghc: "9.6.7" }
53+
- { cabal: "3.12", os: macOS-latest, ghc: "9.8" }
54+
- { cabal: "3.12", os: macOS-latest, ghc: "9.10" }
5555
- { cabal: "3.12", os: macOS-latest, ghc: "9.12" }
5656
fail-fast: false
5757

5858
steps:
5959
# ----------------
60-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v5
6161
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
6262
# ----------------
6363
- uses: haskell-actions/setup@v2
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
sudo apt-get install -y libpapi-dev
7979
echo FLAG_PAPI=-fBenchPAPI >> "$GITHUB_ENV"
80-
if: matrix.os == 'ubuntu-22.04'
80+
if: matrix.os == 'ubuntu-24.04'
8181
# ----------------
8282
- name: Versions
8383
run: |

‎vector-stream/vector-stream.cabal‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Cabal-Version: 1.18
12
Name: vector-stream
23
Version: 0.1.0.1
34
-- don't forget to update the changelog file!
@@ -30,13 +31,14 @@ Tested-With:
3031
GHC == 9.0.2
3132
GHC == 9.2.8
3233
GHC == 9.4.8
33-
GHC == 9.6.4
34-
GHC == 9.8.2
34+
GHC == 9.6.7
35+
GHC == 9.8.4
36+
GHC == 9.10.2
37+
GHC == 9.12.2
3538

36-
Cabal-Version: >=1.10
3739
Build-Type: Simple
3840

39-
Extra-Source-Files:
41+
Extra-Doc-Files:
4042
changelog.md
4143
README.md
4244

@@ -49,7 +51,7 @@ Library
4951
Hs-Source-Dirs:
5052
src
5153

52-
Build-Depends: base >= 4.9 && < 4.22
54+
Build-Depends: base >= 4.9 && < 4.23
5355
, ghc-prim >= 0.2 && < 0.14
5456

5557
source-repository head

‎vector/vector.cabal‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ Tested-With:
5353
GHC == 9.0.2
5454
GHC == 9.2.8
5555
GHC == 9.4.8
56-
GHC == 9.6.4
57-
GHC == 9.8.2
56+
GHC == 9.6.7
57+
GHC == 9.8.4
58+
GHC == 9.10.2
59+
GHC == 9.12.2
5860

5961
Extra-doc-files:
6062
changelog.md
@@ -160,7 +162,7 @@ Library
160162
Install-Includes:
161163
vector.h
162164

163-
Build-Depends: base >= 4.9 && < 4.22
165+
Build-Depends: base >= 4.9 && < 4.23
164166
, primitive >= 0.6.4.0 && < 0.10
165167
, deepseq >= 1.1 && < 1.6
166168
, vector-stream >= 0.1 && < 0.2
@@ -246,7 +248,7 @@ test-suite vector-doctest
246248
buildable: False
247249
build-depends:
248250
base -any
249-
, doctest >=0.15 && <0.24
251+
, doctest >=0.15 && <0.25
250252
, primitive >= 0.6.4.0 && < 0.10
251253
, vector -any
252254

0 commit comments

Comments
 (0)