From 94f168e5ef6fb1e7121197cef9bd32de0ff391d8 Mon Sep 17 00:00:00 2001 From: Max Kainov Date: Tue, 27 Aug 2024 12:12:34 +0200 Subject: [PATCH 1/2] CI: Fix job rerun check --- tests/ci/ci_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/ci/ci_utils.py b/tests/ci/ci_utils.py index e8d9e7dc254..cd7a271f892 100644 --- a/tests/ci/ci_utils.py +++ b/tests/ci/ci_utils.py @@ -286,4 +286,6 @@ class Utils: @staticmethod def is_job_triggered_manually(): - return "robot" not in Envs.GITHUB_ACTOR + return ( + "robot" not in Envs.GITHUB_ACTOR and "clickhouse-ci" not in Envs.GITHUB_ACTOR + ) From 0ad66778da65f9e6c2659044343763e47f3f4878 Mon Sep 17 00:00:00 2001 From: robot-clickhouse Date: Tue, 27 Aug 2024 10:19:19 +0000 Subject: [PATCH 2/2] Automatic style fix --- tests/ci/ci_utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ci/ci_utils.py b/tests/ci/ci_utils.py index cd7a271f892..8b60f61b006 100644 --- a/tests/ci/ci_utils.py +++ b/tests/ci/ci_utils.py @@ -287,5 +287,6 @@ class Utils: @staticmethod def is_job_triggered_manually(): return ( - "robot" not in Envs.GITHUB_ACTOR and "clickhouse-ci" not in Envs.GITHUB_ACTOR + "robot" not in Envs.GITHUB_ACTOR + and "clickhouse-ci" not in Envs.GITHUB_ACTOR )