summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2024-02-28 18:53:06 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2024-02-28 18:53:25 +1000
commit399ba5e0ee5275567292f6c8e1ec05bbe888c007 (patch)
tree4429bca07bd2bd411d199a3f90693f5c6c414361
parentbeca998122089f55e79071a1d9ea77208a25f4c9 (diff)
CI: only check the MR if we're in a merge request pipeline
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab-ci/ci.template3
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42fc09d7..4d3b7b87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1034,6 +1034,9 @@ check-merge-request:
reports:
junit: results.xml
allow_failure: true
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+
build rpm:
extends:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 7c33cd2d..cf0ba552 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -695,6 +695,9 @@ check-merge-request:
reports:
junit: results.xml
allow_failure: true
+ rules:
+ - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+
{% for distro in distributions if distro.name == "fedora" %}
{% set version = "{}".format(distro.versions|last()) %}