Skip to content

Commit

Permalink
Skip clash-ffi for now in GHC 9.8.3+
Browse files Browse the repository at this point in the history
  • Loading branch information
christiaanb committed Jan 2, 2025
1 parent de938a1 commit ccc6daa
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ TESTS="
clash-cores:doctests
clash-cores:unittests
clash-cosim:test
clash-ffi:ffi-interface-tests
clash-lib:doctests
clash-lib:unittests
clash-prelude:doctests
Expand All @@ -42,3 +41,12 @@ 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
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
fi
set -u
8 changes: 8 additions & 0 deletions .ci/gitlab/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ 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
rules:
- if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
script:
- bin/clash-ffi:ffi-interface-tests --smallcheck-max-count 2000

Expand Down Expand Up @@ -172,6 +176,10 @@ ffi:example:
extends:
- .common-local
- .nightly-rules
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
# is fixed
rules:
- if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
stage: test
needs: []
before_script:
Expand Down
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ 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
SKIP_CLASH_FFI_EXAMPLE: "yes"
RUN_TESTS: "always"

- GHC_VERSION: 9.6.6
Expand Down
12 changes: 12 additions & 0 deletions clash-ffi/clash-ffi.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ 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
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1)
buildable: true
else
buildable: false

executable ffi-interface-tests
import: common-options
Expand Down Expand Up @@ -107,3 +113,9 @@ executable 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
if impl(ghc < 9.8.3) || impl(ghc == 9.10.1)
buildable: true
else
buildable: false

0 comments on commit ccc6daa

Please sign in to comment.