summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--.gitlab-ci/ci.template5
2 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc845226..0aa404b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,6 +54,11 @@ include:
# Ubuntu container builder template
- '/templates/ubuntu.yml'
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_PIPELINE_SOURCE == 'push'
+
stages:
- sanity check # CI/commit checks
- prep # prep work like rebuilding the container images if there is a change
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 64b49775..c527d270 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -48,6 +48,11 @@ include:
- '/templates/{{distro.name}}.yml'
{% endfor %}
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+ - if: $CI_PIPELINE_SOURCE == 'push'
+
stages:
- sanity check # CI/commit checks
- prep # prep work like rebuilding the container images if there is a change