aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Audron <audron@cocaine.farm>2021-10-10 16:19:49 +0200
committerMax Audron <audron@cocaine.farm>2021-10-10 16:19:49 +0200
commit55d0df38623cd5b5a415798d44ce19660ec39fcf (patch)
treebf095426811df26fad4d1977402c50b049ca7f5c
parentfix and improve hook error handling (diff)
use merge request pipelines
-rw-r--r--.gitlab-ci.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bc5f8d..93f849d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,3 +7,9 @@ include:
file: "/tanka.base.yaml"
rules:
- if: $CI_COMMIT_TAG
+
+workflow:
+ rules:
+ - if: $CI_MERGE_REQUEST_IID
+ - if: $CI_COMMIT_TAG
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH