Finalize handling of GHC issue in clash-ffi

Author: DigitalBrains1

.ci/build.sh

@@ -34,16 +34,15 @@ clash-prelude:doctests
 clash-prelude:unittests
 clash-testsuite:clash-testsuite
 "
-mkdir bin
-for TEST in $TESTS; do
-  ln -s "$(realpath --relative-to=bin "$(cabal list-bin $TEST)")" bin/$TEST
-done
 
-# TODO: remove this and put it back into tests when
-# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-# is fixed
+# GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
 set +u
 if [[ "$SKIP_CLASH_FFI_EXAMPLE" != "yes" ]]; then
-  ln -s "$(realpath --relative-to=bin "$(cabal list-bin clash-ffi:ffi-interface-tests)")" bin/clash-ffi:ffi-interface-tests
+  TESTS="$TESTS clash-ffi:ffi-interface-tests"
 fi
 set -u
+
+mkdir bin
+for TEST in $TESTS; do
+  ln -s "$(realpath --relative-to=bin "$(cabal list-bin $TEST)")" bin/$TEST
+done

.ci/gitlab/test.yml

@@ -117,8 +117,7 @@ lib:unittests:
 
 ffi:interface-tests:
   extends: .test-nocache
-  # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-  # is fixed
+  # GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
   rules:
     - if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
   script:
@@ -154,8 +153,7 @@ ffi:example:
   extends:
     - .common-local
     - .nightly-rules
-  # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-  # is fixed
+  # GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
   rules:
     - if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
   stage: test

.gitlab-ci.yml

@@ -38,8 +38,7 @@ tests:
         RUN_TESTS: "always"
 
       - GHC_VERSION: 9.8.4
-        # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-        # is fixed
+        # GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
         SKIP_CLASH_FFI_EXAMPLE: "yes"
         RUN_TESTS: "always"
 

clash-ffi/clash-ffi.cabal

@@ -76,8 +76,7 @@ library
     Clash.FFI.VPI.Port
     Clash.FFI.VPI.Port.Direction
     Clash.FFI.VPI.Reg
-  -- TODO: remove this once https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-  -- is fixed
+  -- GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
   if impl(ghc < 9.8.3) || impl(ghc == 9.10.1) || impl(ghc > 9.10.2)
     buildable: True
   else
@@ -114,8 +113,7 @@ test-suite ffi-interface-tests
     , tasty
     , tasty-hunit
     , tasty-smallcheck
-  -- TODO: remove this once https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
-  -- is fixed
+  -- GHC 9.8.3, 9.8.4 and 9.10.2 have issues, see https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
   if impl(ghc < 9.8.3) || impl(ghc == 9.10.1) || impl(ghc > 9.10.2)
     buildable: True
   else