diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-11-30 18:58:49 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-12-03 23:11:31 -0500 |
| commit | 33ec3a0600fe8c009ab8ed6d86941a8fd88fb033 (patch) | |
| tree | 8b901548c2bcb63fcefb8a94984f2ccfc1b8d9cb /.gitlab-ci.yml | |
| parent | e0b08c5f445f70381c854f78913489685feb224e (diff) | |
| download | haskell-33ec3a0600fe8c009ab8ed6d86941a8fd88fb033.tar.gz | |
gitlab-ci: Run linters through ci.sh
Ensuring that the right toolchain is used.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 548fabef9f..7aa6f66c73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: @@ -345,9 +344,13 @@ hadrian-ghc-in-ghci: lint-base: extends: .lint-params + variables: + BUILD_FLAVOUR: default 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) |