File tree Expand file tree Collapse file tree 4 files changed +13
-6
lines changed Expand file tree Collapse file tree 4 files changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -14,8 +14,8 @@ elif [[ "$1" != "" ]]; then
1414 exit 1
1515fi
1616UBUNTU_VERSION=jammy-20250126
17- GHC_VERSIONS=(" 9.10.1" " 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.1" " 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.2.0 " " 3.14.2.0 " " 3.14.2.0 " " 3.14.2.0 " " 3.14.2.0 " " 3.14.2.0 " " 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.
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ default:
1212 timeout : 10 minutes
1313 stage : build
1414 variables :
15- CLASH_DOCKER_TAG : 20250402
16- CACHE_BUST_TOKEN : 3
15+ CLASH_DOCKER_TAG : 20250419
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
Original file line number Diff line number Diff line change @@ -34,12 +34,18 @@ tests:
3434 CI_PARENT_PIPELINE_SOURCE : $CI_PIPELINE_SOURCE
3535 parallel :
3636 matrix :
37- - GHC_VERSION : 9.10.1
37+ - GHC_VERSION : 9.12.2
3838 RUN_TESTS : " always"
39+ # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
40+ # has landed in stable release
41+ SKIP_CLASH_FFI_EXAMPLE : " yes"
42+
43+ - GHC_VERSION : 9.10.1
44+ RUN_TESTS : " nightly"
3945
4046 - GHC_VERSION : 9.8.4
4147 # TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
42- # is fixed
48+ # has landed in stable release
4349 SKIP_CLASH_FFI_EXAMPLE : " yes"
4450 RUN_TESTS : " always"
4551
Original file line number Diff line number Diff line change 1+ ADD: Added GHC 9.12 support
You can’t perform that action at this time.
0 commit comments