gitlab: Don't run lint-submods job on Marge branches
authorBen Gamari <ben@smart-cactus.org>
Tue, 9 Apr 2019 16:30:14 +0000 (12:30 -0400)
committerBen Gamari <ben@smart-cactus.org>
Fri, 12 Apr 2019 19:41:07 +0000 (15:41 -0400)
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.

.gitlab-ci.yml

index 4f1aab4..4475d07 100644 (file)
@@ -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