summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2023-03-15 09:28:12 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2023-03-15 09:30:58 +1000
commitf1e93b5159a5e693be02418147369201e9909803 (patch)
tree2526d0f037ae9e717c674e707d83cefa6a59a55e
parentda58d59b9923e1b43b3a7790006795bfc16b5188 (diff)
downloadlibinput-f1e93b5159a5e693be02418147369201e9909803.tar.gz
CI: add new workflow rules
Required for pipelines to run after some infrastructure changes, see https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-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