Skip to content

Commit 719f5d0

Browse files
Bump bounds for ghc-prim in clash-{prelude,ghc}
1 parent ba10cb9 commit 719f5d0

File tree

11 files changed

+16
-12
lines changed

11 files changed

+16
-12
lines changed

.ci/docker/build-and-publish-docker-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ elif [[ "$1" != "" ]]; then
1414
exit 1
1515
fi
1616
UBUNTU_VERSION=jammy-20250126
17-
GHC_VERSIONS=("9.10.1" "9.8.4" "9.6.7" "9.4.8" "9.2.8" "9.0.2" "8.10.7")
17+
GHC_VERSIONS=("9.10.2" "9.8.4" "9.6.7" "9.4.8" "9.2.8" "9.0.2" "8.10.7")
1818
CABAL_VERSIONS=("3.14.1.1" "3.14.1.1" "3.14.1.1" "3.14.1.1" "3.14.1.1" "3.14.1.1" "3.12.1.0")
1919

2020
# We want to use docker buildkit so that our layers are built in parallel. This

.ci/gitlab/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.benchmark:
2-
image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20250402
2+
image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20250719
33
stage: test
44
timeout: 2 hours
55
variables:

.ci/gitlab/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default:
1212
timeout: 10 minutes
1313
stage: build
1414
variables:
15-
CLASH_DOCKER_TAG: 20250402
15+
CLASH_DOCKER_TAG: 20250719
1616
CACHE_BUST_TOKEN: 3
1717
# Note that we copy+paste the image name into CACHE_FALLBACK_KEY. If we don't,
1818
# $GHC_VERSION gets inserted at verbatim, instead of resolving to some ghc version.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159

160160
# Run steps inside the clash CI docker image
161161
container:
162-
image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20250402
162+
image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20250719
163163

164164
env:
165165
THREADS: 2

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tests:
3434
CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
3535
parallel:
3636
matrix:
37-
- GHC_VERSION: 9.10.1
37+
- GHC_VERSION: 9.10.2
3838
RUN_TESTS: "always"
3939

4040
- GHC_VERSION: 9.8.4

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ write-ghc-environment-files: always
1515
-- index state, to go along with the cabal.project.freeze file. update the index
1616
-- state by running `cabal update` twice and looking at the index state it
1717
-- displays to you (as the second update will be a no-op)
18-
index-state: 2025-02-10T14:25:49Z
18+
index-state: 2025-07-19T09:09:36Z
1919

2020
-- For some reason the `clash-testsuite` executable fails to run without
2121
-- this, as it cannot find the related library...
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ADDED: Support for GHC 9.10.2

clash-ffi/clash-ffi.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ library
7878
Clash.FFI.VPI.Reg
7979
-- TODO: remove this once https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
8080
-- is fixed
81-
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1)
81+
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1) || impl(ghc == 9.10.2)
8282
buildable: True
8383
else
8484
buildable: False
@@ -115,7 +115,7 @@ executable ffi-interface-tests
115115
, tasty-smallcheck
116116
-- TODO: remove this once https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
117117
-- is fixed
118-
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1)
118+
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1) || impl(ghc == 9.10.2)
119119
buildable: True
120120
else
121121
buildable: False

clash-ghc/clash-ghc.cabal

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ common common-options
121121
library
122122
import: common-options
123123
HS-Source-Dirs: src-ghc, src-bin-common
124-
if impl(ghc >= 9.10.0)
124+
if impl(ghc >= 9.10.2)
125+
HS-Source-Dirs: src-bin-9.10.2
126+
elif impl(ghc >= 9.10.0)
125127
HS-Source-Dirs: src-bin-9.10.1
126128
elif impl(ghc >= 9.8.0)
127129
HS-Source-Dirs: src-bin-9.8
@@ -174,7 +176,7 @@ library
174176
deepseq >= 1.3.0.2 && < 1.6,
175177
time >= 1.4.0.1 && < 1.15,
176178
ghc-boot >= 8.10.0 && < 9.11,
177-
ghc-prim >= 0.3.1.0 && < 0.12,
179+
ghc-prim >= 0.3.1.0 && < 0.13,
178180
ghci >= 8.10.0 && < 9.11,
179181
uniplate >= 1.6.12 && < 1.8,
180182
reflection >= 2.1.2 && < 3.0,

clash-prelude/clash-prelude.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ Library
333333
deepseq >= 1.4.1.0 && < 1.6,
334334
distributive >= 0.1 && < 1.0,
335335
extra >= 1.6.17 && < 1.9,
336-
ghc-prim >= 0.5.1.0 && < 0.12,
336+
ghc-prim >= 0.5.1.0 && < 0.13,
337337
ghc-typelits-extra >= 0.4 && < 0.5,
338338
ghc-typelits-knownnat >= 0.7.2 && < 0.8,
339339
ghc-typelits-natnormalise >= 0.7.2 && < 0.8,

0 commit comments

Comments
 (0)