summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-07-05 11:15:47 -0400
committerBen Gamari <ben@smart-cactus.org>2020-07-06 12:15:24 -0400
commitac697a44ffb216cb351468b1b0e9ddb84de1495a (patch)
tree020a06f8b185aa66e4f327a09d31413996a6f5c3
parentb12faad0ad27b56cfc35ac1faef448b6f2245734 (diff)
downloadhaskell-ac697a44ffb216cb351468b1b0e9ddb84de1495a.tar.gz
gitlab-ci: Reintroduce workflow stanza
-rw-r--r--.gitlab-ci.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b929bad9d..842e5b1eea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,15 @@ stages:
- if: '$CI_COMMIT_BRANCH =~ /ghc-[0.9]+\.[0-9]+/'
- if: '$CI_PIPELINE_SOURCE == "web"'
+workflow:
+ # N.B. Don't run on wip/ branches, instead on run on merge requests.
+ rules:
+ - if: $CI_MERGE_REQUEST_ID
+ - if: $CI_COMMIT_TAG
+ - if: '$CI_COMMIT_BRANCH == "wip/marge_bot_batch_merge_job"'
+ - if: '$CI_COMMIT_BRANCH =~ /ghc-[0.9]+\.[0-9]+/'
+ - if: '$CI_PIPELINE_SOURCE == "web"'
+
############################################################
# Runner Tags
############################################################