summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-04-09 12:30:14 -0400
committerBen Gamari <ben@smart-cactus.org>2019-04-12 15:40:41 -0400
commit7a3c27a7bc8f6530fc16f2556c9292fe67ca0da1 (patch)
tree75b79173b25d23f5fa0f522fab12ab51c23cba32
parentf4b5a6c040abb492367fdfe18c4f2ebf03c0d084 (diff)
downloadhaskell-wip/fix-marge.tar.gz
gitlab: Don't run lint-submods job on Marge brancheswip/fix-marge
This broke Marge by creating a second pipeline (consisting of only the `lint-submods` job). Marge then looked at this pipeline and concluded that CI for her merge branch passed. However, this is ignores the fact that the majority of the CI jobs are triggered on `merge_request` and are therefore in another pipeline.
-rw-r--r--.gitlab-ci.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e8d50d5aa..c5f0ad098d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,14 @@ lint-submods:
refs:
- master
- /ghc-[0-9]+\.[0-9]+/
- - wip/marge_bot_batch_merge_job
+
+lint-submods-marge:
+ extends: .lint-submods
+ only:
+ refs:
+ - merge_requests
+ variables:
+ - $CI_MERGE_REQUEST_LABELS =~ /.*wip/marge_bot_batch_merge_job.*/
lint-submods-mr:
extends: .lint-submods