Merge pull request #2983 from clash-lang/add-9.10.2-support

Add GHC 9.10.2 support

Author: martijnbastiaan

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

@@ -14,7 +14,7 @@ elif [[ "$1" != "" ]]; then
   exit 1
 fi
 UBUNTU_VERSION=jammy-20250126
-GHC_VERSIONS=("9.10.1" "9.8.4"  "9.6.7"  "9.4.8"  "9.2.8"   "9.0.2"   "8.10.7")
+GHC_VERSIONS=("9.10.2" "9.8.4"  "9.6.7"  "9.4.8"  "9.2.8"   "9.0.2"   "8.10.7")
 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")
 
 # We want to use docker buildkit so that our layers are built in parallel. This

.ci/gitlab/benchmark.yml

@@ -1,5 +1,5 @@
 .benchmark:
-  image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20250402
+  image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20250719
   stage: test
   timeout: 2 hours
   variables:

.ci/gitlab/common.yml

@@ -12,7 +12,7 @@ default:
   timeout: 10 minutes
   stage: build
   variables:
-    CLASH_DOCKER_TAG: 20250402
+    CLASH_DOCKER_TAG: 20250719
     CACHE_BUST_TOKEN: 3
     # Note that we copy+paste the image name into CACHE_FALLBACK_KEY. If we don't,
     # $GHC_VERSION gets inserted at verbatim, instead of resolving to some ghc version.

.github/workflows/ci.yml

@@ -159,7 +159,7 @@ jobs:
 
     # Run steps inside the clash CI docker image
     container:
-      image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20250402
+      image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20250719
 
       env:
         THREADS: 2

.gitlab-ci.yml

@@ -34,7 +34,10 @@ tests:
     CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
   parallel:
     matrix:
-      - GHC_VERSION: 9.10.1
+      - GHC_VERSION: 9.10.2
+        # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
+        # is fixed
+        SKIP_CLASH_FFI_EXAMPLE: "yes"
         RUN_TESTS: "always"
 
       - GHC_VERSION: 9.8.4

cabal.project

@@ -15,7 +15,7 @@ write-ghc-environment-files: always
 -- index state, to go along with the cabal.project.freeze file. update the index
 -- state by running `cabal update` twice and looking at the index state it
 -- displays to you (as the second update will be a no-op)
-index-state: 2025-02-10T14:25:49Z
+index-state: 2025-07-19T09:09:36Z
 
 -- For some reason the `clash-testsuite` executable fails to run without
 -- this, as it cannot find the related library...

changelog/2025-07-19T13_48_58+02_00_add_9102_support

@@ -0,0 +1 @@
+ADDED: Support for GHC 9.10.2

clash-ghc/clash-ghc.cabal

@@ -121,8 +121,10 @@ common common-options
 library
   import:             common-options
   HS-Source-Dirs:     src-ghc, src-bin-common
-  if impl(ghc >= 9.10.0)
-    HS-Source-Dirs: src-bin-9.10
+  if impl(ghc >= 9.10.2)
+    HS-Source-Dirs: src-bin-9.10.2
+  elif impl(ghc >= 9.10.0)
+    HS-Source-Dirs: src-bin-9.10.1
   elif impl(ghc >= 9.8.0)
     HS-Source-Dirs: src-bin-9.8
   elif impl(ghc >= 9.6.0)
@@ -174,7 +176,7 @@ library
                       deepseq                   >= 1.3.0.2  && < 1.6,
                       time                      >= 1.4.0.1  && < 1.15,
                       ghc-boot                  >= 8.10.0   && < 9.11,
-                      ghc-prim                  >= 0.3.1.0  && < 0.12,
+                      ghc-prim                  >= 0.3.1.0  && < 0.13,
                       ghci                      >= 8.10.0   && < 9.11,
                       uniplate                  >= 1.6.12   && < 1.8,
                       reflection                >= 2.1.2    && < 3.0,