diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-04-09 12:30:14 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-04-12 15:41:07 -0400 |
| commit | 8870a51bd62f2d4ee7bd21b96240d5806c2817af (patch) | |
| tree | a04016dcd7f6e2c9a3b206d337fc5e0c8bb14b86 /.gitlab-ci.yml | |
| parent | 30a0988d2a1398bc5be79e506a3cc55df4b5bd79 (diff) | |
| download | haskell-8870a51bd62f2d4ee7bd21b96240d5806c2817af.tar.gz | |
gitlab: Don't run lint-submods job on Marge branches
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.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f1aab4045..4475d0755f 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 |