From 698967588e8d01d41dee66b39de19feb3bf6a483 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 30 Jan 2022 08:30:15 -0500 Subject: gitlab-ci: Add lint-notes job --- .gitlab-ci.yml | 7 +++++++ utils/notes-util/check.sh | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cd7e2673f..ef27e6ff58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,6 +192,13 @@ ghc-linters: - if: $CI_MERGE_REQUEST_ID - *drafts-can-fail-lint +lint-notes: + image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" + extends: .lint + script: + - utils/notes-util/check.sh + dependencies: [] + # Run mypy Python typechecker on linter scripts. lint-linters: image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" diff --git a/utils/notes-util/check.sh b/utils/notes-util/check.sh index 079eeec1cd..acac923471 100755 --- a/utils/notes-util/check.sh +++ b/utils/notes-util/check.sh @@ -3,10 +3,11 @@ set -e CABAL_INSTALL="${CABAL_INSTALL:-cabal}" +GHC="${GHC:-ghc}" cd "$(dirname $0)" -"$CABAL_INSTALL" build -bin="$("$CABAL_INSTALL" list-bin ghc-notes)" +"$CABAL_INSTALL" build -w "$GHC" +bin="$("$CABAL_INSTALL" list-bin -w "$GHC" ghc-notes)" cd "$(git rev-parse --show-toplevel)" "$bin" broken-refs \ | grep -v "utils/notes-util/expected-broken-note-refs:" \ -- cgit v1.2.1