Skip to content

Commit bc162f0

Browse files
Add GHC 9.12 to CI
1 parent 45f19e6 commit bc162f0

File tree

7 files changed

+37
-8
lines changed

7 files changed

+37
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ elif [[ "$1" != "" ]]; then
1414
exit 1
1515
fi
1616
UBUNTU_VERSION=jammy-20250126
17-
GHC_VERSIONS=("9.10.2" "9.8.4" "9.6.7" "9.4.8" "9.2.8" "9.0.2" "8.10.7")
18-
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")
17+
GHC_VERSIONS=("9.12.2" "9.10.2" "9.8.4" "9.6.7" "9.4.8" "9.2.8" "9.0.2" "8.10.7")
18+
CABAL_VERSIONS=("3.14.2.0" "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
2121
# is ignored completely on versions of docker which don't support buildkit.

.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-20250719
2+
image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20250928
33
stage: test
44
timeout: 2 hours
55
variables:

.ci/gitlab/common.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ default:
1212
timeout: 10 minutes
1313
stage: build
1414
variables:
15-
CLASH_DOCKER_TAG: 20250719
16-
CACHE_BUST_TOKEN: 3
15+
CLASH_DOCKER_TAG: 20250928
16+
CACHE_BUST_TOKEN: 4
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.
1919
CACHE_FALLBACK_KEY: $CI_JOB_NAME-master-ghcr.io/clash-lang/clash-ci:$GHC_VERSION-$CLASH_DOCKER_TAG-$CACHE_BUST_TOKEN-3-non_protected

.ci/stack-9.12.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
resolver: nightly-2025-09-28
2+
3+
ghc-options:
4+
"$locals": -Wall -Wcompat
5+
6+
packages:
7+
- clash-prelude
8+
- clash-prelude-hedgehog
9+
- clash-lib
10+
- clash-lib-hedgehog
11+
- clash-ghc
12+
- tests
13+
14+
extra-deps:
15+
- QuickCheck-2.15.0.1@sha256:0cfd337bb9e6fbf09255bd24bb498a156f1d9bcd465396ac8657b25034b9ee31,9046
16+
- tasty-flaky-0.1.2.0@sha256:2f91ab9f55ae0c472474087f98bb54076aca18f8b058343479d24597a3aa181b,1858

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: ["macOS-13", "windows-latest"]
24-
ghc: ["8.10", "9.0", "9.2", "9.4", "9.6", "9.8", "9.10"]
24+
ghc: ["8.10", "9.0", "9.2", "9.4", "9.6", "9.8", "9.10", "9.12"]
2525
exclude:
2626
# Some tests fail with a mysterious -11 error code.
2727
- os: "macOS-13"
@@ -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 }}-20250719
162+
image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20250928
163163

164164
env:
165165
THREADS: 2

.gitlab-ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,27 @@ tests:
3434
CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
3535
parallel:
3636
matrix:
37+
<<<<<<< HEAD
3738
- GHC_VERSION: 9.10.2
3839
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
3940
# is fixed
4041
SKIP_CLASH_FFI_EXAMPLE: "yes"
42+
||||||| parent of 56dd077f5 (Add GHC 9.12 to CI)
43+
- GHC_VERSION: 9.10.1
44+
=======
45+
- GHC_VERSION: 9.12.2
46+
>>>>>>> 56dd077f5 (Add GHC 9.12 to CI)
4147
RUN_TESTS: "always"
48+
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
49+
# has landed in stable release
50+
SKIP_CLASH_FFI_EXAMPLE: "yes"
51+
52+
- GHC_VERSION: 9.10.1
53+
RUN_TESTS: "nightly"
4254

4355
- GHC_VERSION: 9.8.4
4456
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
45-
# is fixed
57+
# has landed in stable release
4658
SKIP_CLASH_FFI_EXAMPLE: "yes"
4759
RUN_TESTS: "always"
4860

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ADD: Added GHC 9.12 support

0 commit comments

Comments
 (0)