summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@well-typed.com>2020-08-21 11:27:53 -0400
committerBen Gamari <ben@well-typed.com>2020-08-21 11:27:53 -0400
commit989c1c27b1ec69d8cf56b438f0173d92c3547ab5 (patch)
tree790794b81a3b583cb2159d6715fc484f04873cb7
parentfddddbf47d6ba2b1b3b6ec89bd40c8fa020e6606 (diff)
downloadhaskell-989c1c27b1ec69d8cf56b438f0173d92c3547ab5.tar.gz
gitlab-ci: Test master branch as well
While these builds are strictly speaking redundant (since every commit is tested by @marge-bot before making it into `master`), they are nevertheless useful as they are displayed in the branch's commit list in GitLab's web interface. Fixes #18595.
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aad9526648..89f5e0c004 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,7 @@ workflow:
rules:
- if: $CI_MERGE_REQUEST_ID
- if: $CI_COMMIT_TAG
+ - if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_COMMIT_BRANCH == "wip/marge_bot_batch_merge_job"'
- if: '$CI_COMMIT_BRANCH =~ /ghc-[0.9]+\.[0-9]+/'
- if: '$CI_PIPELINE_SOURCE == "web"'