From ce1e7a5afef20fbdbdd978c4855f5ec0f8ca476b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 20 Nov 2020 09:37:08 +0100 Subject: [PATCH] ci: Check that allow-collaboration is checked for merge requests This required for merging to be possible, so make the lack of this check box being checked a discoverable error. Part-of: --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5d8ce5ae..2d69858f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,24 @@ check-commit-log: reports: junit: commit-message-junit-report.xml +check-merge-request: + extends: + - .fdo.ci-fairy + stage: review + script: + - if [[ x"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "x" ]] ; + then + ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request-report.xml ; + else + echo "Not a merge request" ; + fi + artifacts: + expire_in: 1 week + paths: + - check-merge-request-report.xml + reports: + junit: check-merge-request-report.xml + build-mutter: extends: - .fdo.distribution-image@fedora