Skip to content

Commit 58e4bb2

Browse files
authored
Merge pull request #503 from IntersectMBO/jdral/ghc-9.12
Use `ghc-9.12.1` in GHA in stead of the prerelease
2 parents 42711c5 + 0bdaab1 commit 58e4bb2

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
# TODO: Change "9.12.0.20241031" --> "9.12.1" after official release
26-
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2", "9.10.1", "9.12.0.20241031"]
25+
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2", "9.10.1", "9.12.1"]
2726
cabal: ["3.10.2.1"]
2827
os: [ubuntu-latest, windows-latest, macOS-latest]
2928
cabal-flags: [""]
@@ -68,8 +67,6 @@ jobs:
6867
ghc-version: ${{ matrix.ghc }}
6968
cabal-version: ${{ matrix.cabal }}
7069
cabal-update: true
71-
# TODO: remove once 9.12.1 is officially released
72-
ghcup-release-channel: https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml
7370

7471
- name: Install liburing (on Linux)
7572
id: setup-liburing

cabal.project.release

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
index-state:
22
-- Bump this if you need newer packages from Hackage
3-
-- current date: quickcheck-lockstep-0.6.0
4-
, hackage.haskell.org 2024-12-03T16:12:22Z
3+
-- current date: ghc-9.12.1
4+
, hackage.haskell.org 2024-12-19T11:42:39Z
55

66
packages: .
77

@@ -22,8 +22,9 @@ constraints: bloomfilter <0
2222
-- we could add a conditional on (+serialblockio) to remove this import automatically.
2323
import: cabal.project.blockio-uring
2424

25+
-- TODO: remove this once all packages have upgraded their dependencies for ghc-9.12
2526
if impl(ghc >=9.12)
26-
allow-newer: base
27+
allow-newer: base, template-haskell, ghc-prim
2728

2829
-- TODO: fix assembly error in text-2.1.2
2930
if (impl(ghc < 9.0) && os(windows))

0 commit comments

Comments
 (0)