diff options
| author | Ben Gamari <ben@well-typed.com> | 2022-03-01 16:26:23 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-03-11 19:57:03 -0500 |
| commit | 62caaa9b381b07208c8a2fae20fb7fee9e951004 (patch) | |
| tree | ac90f58f4c605b95c0f340b0fbb7c6983bd00ce4 /hadrian | |
| parent | 24b6af26e2e03c93e274ba15c6ead897d884fdd4 (diff) | |
| download | haskell-62caaa9b381b07208c8a2fae20fb7fee9e951004.tar.gz | |
gitlab-ci: Use the linters image in hlint job
As the `hlint` executable is only available in the linters image.
Fixes #21146.
Diffstat (limited to 'hadrian')
| -rwxr-xr-x | hadrian/lint | 4 | ||||
| -rw-r--r-- | hadrian/src/Rules/Lint.hs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hadrian/lint b/hadrian/lint index 8c43c89bd1..d0348532f9 100755 --- a/hadrian/lint +++ b/hadrian/lint @@ -1,5 +1,3 @@ #!/usr/bin/env bash -"hadrian/build" "$@" test --test-root-dirs="testsuite/tests/linters" - # hlint targets disabled as they do not currently run on CI. - # lint:compiler lint:base +"hadrian/build" "$@" test --test-root-dirs="testsuite/tests/linters" lint:compiler lint:base diff --git a/hadrian/src/Rules/Lint.hs b/hadrian/src/Rules/Lint.hs index 6ca4e12674..dda608353c 100644 --- a/hadrian/src/Rules/Lint.hs +++ b/hadrian/src/Rules/Lint.hs @@ -12,7 +12,7 @@ lintRules = do root <- buildRootRules "lint:base" ~> lint base "lint:compiler" ~> lint compiler - root -/- "libraries" -/- "base" -/- "include" -/- "HsBaseConfig.h" %> \_ -> + "libraries" -/- "base" -/- "include" -/- "HsBaseConfig.h" %> \_ -> -- ./configure is called here manually because we need to generate -- HsBaseConfig.h, which is created from HsBaseConfig.h.in. ./configure -- is usually run by Cabal which generates this file but if we do that |