Skip to content
Snippets Groups Projects
Commit bf66d123 authored by Ben Gamari's avatar Ben Gamari
Browse files

gitlab-ci: Run linters through ci.sh

Ensuring that the right toolchain is used.
parent c7c87c05
No related branches found
No related tags found
No related merge requests found
Pipeline #28256 failed
......@@ -299,12 +299,11 @@ hadrian-ghc-in-ghci:
tags:
- x86_64-linux
script:
- git clean -xdf && git submodule foreach git clean -xdf
- .gitlab/ci.sh setup
- .gitlab/ci.sh configure
- cabal update
- cd hadrian; cabal new-build -j`../mk/detect-cpu-count.sh` --with-compiler=$GHC --project-file=ci.project; cd ..
- git clean -xdf && git submodule foreach git clean -xdf
- ./boot
- ./configure $CONFIGURE_ARGS
# Load ghc-in-ghci then immediately exit and check the modules loaded
- echo ":q" | hadrian/ghci -j`mk/detect-cpu-count.sh`| tail -n2 | grep "Ok,"
after_script:
......@@ -346,8 +345,10 @@ hadrian-ghc-in-ghci:
lint-base:
extends: .lint-params
script:
- hadrian/build -c -j stage1:lib:base
- hadrian/build -j lint:base
- .gitlab/ci.sh setup
- .gitlab/ci.sh configure
- .gitlab/ci.sh run_hadrian stage1:lib:base
- .gitlab/ci.sh run_hadrian lint:base
############################################################
# Validation via Pipelines (make)
......
......@@ -575,7 +575,7 @@ case $1 in
test_hadrian || res=$?
push_perf_notes
exit $res ;;
run_hadrian) run_hadrian $@ ;;
run_hadrian) shift; run_hadrian $@ ;;
perf_test) run_perf_test ;;
clean) clean ;;
shell) shell $@ ;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment