From 86985ed9db1cd76cd67de2405eccfadc82c677a9 Mon Sep 17 00:00:00 2001 From: wangyu <53896905+yenuo26@users.noreply.github.com> Date: Fri, 10 Apr 2026 11:05:19 +0800 Subject: [PATCH] [CI] Update merge condition in upload_pipeline_with_skip_ci.sh to include 'merge-test' label for non-main branches (#2666) Signed-off-by: wangyu <410167048@qq.com> Co-authored-by: Hongsheng Liu --- .buildkite/scripts/upload_pipeline_with_skip_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/upload_pipeline_with_skip_ci.sh b/.buildkite/scripts/upload_pipeline_with_skip_ci.sh index c00140de4..6259d39b2 100644 --- a/.buildkite/scripts/upload_pipeline_with_skip_ci.sh +++ b/.buildkite/scripts/upload_pipeline_with_skip_ci.sh @@ -126,7 +126,7 @@ if skip: else: rep = "'true'" ready_rep = "'build.branch != \"main\" && build.pull_request.labels includes \"ready\"'" - merge_rep = "'build.branch == \"main\" && build.env(\"NIGHTLY\") != \"1\"'" + merge_rep = "'(build.branch == \"main\" && build.env(\"NIGHTLY\") != \"1\") || (build.branch != \"main\" && build.pull_request.labels includes \"merge-test\")'" rendered = ( continuation .replace("__IMAGE_BUILD_IF__", rep)