diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-13 17:36:30 +0100 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-04-26 09:24:25 +0000 |
| commit | 1fbfc8431d2e4c03f111a177408a34eb30c44f1b (patch) | |
| tree | b7fc54930d569cab1656bbee77e27bb8cd347b49 | |
| parent | 01f886b2351db29bf1631a841e17b13b61aaa99d (diff) | |
| download | haskell-wip/prof-check.tar.gz | |
ci: Add linting job which checks authors are not GHC CIwip/prof-check
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rwxr-xr-x | .gitlab/ci.sh | 13 |
2 files changed, 31 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a39ce85ce1..5df3afc8c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -232,6 +232,24 @@ typecheck-testsuite: - _build/stage0/bin/lint-submodule-refs . $(git rev-list $base..$CI_COMMIT_SHA) dependencies: [] +# We allow the submodule checker to fail when run on merge requests (to +# accommodate, e.g., haddock changes not yet upstream) but not on `master` or +# Marge jobs. +lint-author: + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10:$DOCKER_REV" + extends: .lint-params + variables: + BUILD_FLAVOUR: default + script: + - git fetch "$CI_MERGE_REQUEST_PROJECT_URL" $CI_MERGE_REQUEST_TARGET_BRANCH_NAME + - base="$(git merge-base FETCH_HEAD $CI_COMMIT_SHA)" + - "echo Linting authors between $base..$CI_COMMIT_SHA" + - .gitlab/ci.sh lint_author $base $CI_COMMIT_SHA + dependencies: [] + rules: + - if: $CI_MERGE_REQUEST_ID + - *drafts-can-fail-lint + lint-submods: extends: .lint-submods # Allow failure on merge requests since any necessary submodule patches may diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 917e9d5e4d..f04b3861e0 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -675,6 +675,18 @@ function shell() { run "$cmd" } +function lint_author(){ + base=$1 + head=$2 + for email in $(git log --format='%ae' $base..$head); do + if [ $email == "ghc-ci@gitlab-haskell.org" ]; + then + fail "Commit has GHC CI author, please amend the author information." + fi + done +} + + setup_locale # Platform-specific environment initialization @@ -772,6 +784,7 @@ case $1 in run_hadrian) shift; run_hadrian "$@" ;; perf_test) run_perf_test ;; cabal_test) cabal_test ;; + lint_author) shift; lint_author "$@" ;; clean) clean ;; save_cache) save_cache ;; shell) shift; shell "$@" ;; |