Skip to content

Commit 973e91a

Browse files
committed
ci: Remove conditional test run for clash-ffi
1 parent e227a2d commit 973e91a

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

.ci/build.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cabal v2-build all --write-ghc-environment-files=always
2828
# Put all the test binaries in a predictable location
2929
TESTS="
3030
clash-cosim:test
31+
clash-ffi:ffi-interface-tests
3132
clash-lib:doctests
3233
clash-lib:unittests
3334
clash-prelude:doctests
@@ -38,12 +39,3 @@ mkdir bin
3839
for TEST in $TESTS; do
3940
ln -s "$(realpath --relative-to=bin "$(cabal list-bin $TEST)")" bin/$TEST
4041
done
41-
42-
# TODO: remove this and put it back into tests when
43-
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
44-
# is fixed
45-
set +u
46-
if [[ "$SKIP_CLASH_FFI_EXAMPLE" != "yes" ]]; then
47-
ln -s "$(realpath --relative-to=bin "$(cabal list-bin clash-ffi:ffi-interface-tests)")" bin/clash-ffi:ffi-interface-tests
48-
fi
49-
set -u

.ci/gitlab/test.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ lib:unittests:
117117

118118
ffi:interface-tests:
119119
extends: .test-nocache
120-
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
121-
# is fixed
122-
rules:
123-
- if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
124120
script:
125121
- bin/clash-ffi:ffi-interface-tests --smallcheck-max-count 2000
126122

@@ -154,10 +150,6 @@ ffi:example:
154150
extends:
155151
- .common-local
156152
- .nightly-rules
157-
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
158-
# is fixed
159-
rules:
160-
- if: $SKIP_CLASH_FFI_EXAMPLE != "yes"
161153
stage: test
162154
needs: []
163155
before_script:

.gitlab-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,9 @@ tests:
3535
parallel:
3636
matrix:
3737
- GHC_VERSION: 9.10.3
38-
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
39-
# is fixed
40-
SKIP_CLASH_FFI_EXAMPLE: "yes"
4138
RUN_TESTS: "always"
4239

4340
- GHC_VERSION: 9.8.4
44-
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
45-
# is fixed
46-
SKIP_CLASH_FFI_EXAMPLE: "yes"
4741
RUN_TESTS: "always"
4842

4943
- GHC_VERSION: 9.6.7

0 commit comments

Comments
 (0)