From c8ad134d4671851cb053846cf4331c5fa707e1b9 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 5 Feb 2025 19:37:44 +0100 Subject: [PATCH] ci/yaml-toml-shell-py-test: don't run on post-merge pipelines Part-of: --- .gitlab-ci/test/gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 26882d8216b..8bcf876a63d 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -64,7 +64,8 @@ yaml-toml-shell-py-test: - !reference [.disable-farm-mr-rules, rules] - !reference [.never-post-merge-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules] - - if: $GITLAB_USER_LOGIN == "marge-bot" + # merge pipeline + - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event" changes: &lint_files - .gitlab-ci/test/gitlab-ci.yml - .gitlab-ci/**/*.sh