This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 6ea3ed323ea [ci](branch-4.1) set required and manager can skip
buildall (#61293)
6ea3ed323ea is described below
commit 6ea3ed323eac3ad896eb58b981e5b6300412c0b3
Author: Dongyang Li <[email protected]>
AuthorDate: Tue Mar 17 11:15:33 2026 +0800
[ci](branch-4.1) set required and manager can skip buildall (#61293)
and setup auto-cherry-pick for branch-4.1
---
.asf.yaml | 21 +++++++++++++++++++++
.github/workflows/auto-cherry-pick.yml | 14 ++++++++++++--
.github/workflows/comment-to-trigger-teamcity.yml | 4 ++++
regression-test/pipeline/common/teamcity-utils.sh | 1 +
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index bef4ab13677..6a5d11d6640 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -69,6 +69,27 @@ github:
dismiss_stale_reviews: true
require_code_owner_reviews: true
required_approving_review_count: 1
+ branch-4.1:
+ required_status_checks:
+ strict: false
+ contexts:
+ - License Check
+ - Clang Formatter
+ - CheckStyle
+ - Build Broker
+ - FE UT (Doris FE UT)
+ - BE UT (Doris BE UT)
+ - Cloud UT (Doris Cloud UT)
+ - COMPILE (DORIS_COMPILE)
+ - P0 Regression (Doris Regression)
+ - NonConcurrent Regression (nonConcurrent)
+ - External Regression (Doris External Regression)
+ - cloud_p0 (Doris Cloud Regression)
+ - vault_p0 (Doris Cloud Regression)
+ required_pull_request_reviews:
+ require_code_owner_reviews: true
+ required_approving_review_count: 1
+ dismiss_stale_reviews: true
branch-4.0:
required_status_checks:
strict: false
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index 86462eec1ba..cc75bc0ba68 100644
--- a/.github/workflows/auto-cherry-pick.yml
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -31,7 +31,7 @@ permissions:
jobs:
auto_cherry_pick:
runs-on: ubuntu-latest
- if: ${{(contains(github.event.pull_request.labels.*.name, 'dev/4.0.x') ||
github.event.label.name == 'dev/4.0.x') && github.event.pull_request.merged ==
true }}
+ if: ${{(contains(github.event.pull_request.labels.*.name, 'dev/4.0.x') ||
github.event.label.name == 'dev/4.0.x' ||
contains(github.event.pull_request.labels.*.name, 'dev/4.1.x') ||
github.event.label.name == 'dev/4.1.x') && github.event.pull_request.merged ==
true }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
@@ -62,4 +62,14 @@ jobs:
REPO_NAME: ${{ github.repository }}
CONFLICT_LABEL: dev/4.0.x-conflict
run: |
- python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-4.0
+ python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-4.0
+
+ - name: Auto cherry-pick to branch-4.1
+ if: ${{ ((github.event.action == 'labeled' && github.event.label.name
== 'dev/4.1.x'))|| ((github.event_name == 'pull_request_target' &&
github.event.action == 'closed') &&
contains(github.event.pull_request.labels.*.name, 'dev/4.1.x')) }}
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ REPO_NAME: ${{ github.repository }}
+ CONFLICT_LABEL: dev/4.1.x-conflict
+ run: |
+ python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-4.1
+
diff --git a/.github/workflows/comment-to-trigger-teamcity.yml
b/.github/workflows/comment-to-trigger-teamcity.yml
index a27c579d894..6a88f89652c 100644
--- a/.github/workflows/comment-to-trigger-teamcity.yml
+++ b/.github/workflows/comment-to-trigger-teamcity.yml
@@ -86,6 +86,10 @@ jobs:
echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip
buildall for branch-4.0"
echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
+ elif [[ "${COMMENT_USER_ID}" == '9208457' && "${TARGET_BRANCH}" ==
*'branch-4.1'* ]]; then
+ echo "COMMENT_USER_ID ${COMMENT_USER_ID} is allowed to skip
buildall for branch-4.1"
+ echo "comment_trigger=false" | tee -a "$GITHUB_OUTPUT"
+ echo "comment_skip=true" | tee -a "$GITHUB_OUTPUT"
else
echo "COMMENT_USER_ID ${COMMENT_USER_ID} is not allowed to
skip buildall."
exit
diff --git a/regression-test/pipeline/common/teamcity-utils.sh
b/regression-test/pipeline/common/teamcity-utils.sh
index cd0e5a6a96d..c9b61c6fb54 100644
--- a/regression-test/pipeline/common/teamcity-utils.sh
+++ b/regression-test/pipeline/common/teamcity-utils.sh
@@ -26,6 +26,7 @@
declare -A targetBranch_to_pipelines
targetBranch_to_pipelines=(
['master']='feut beut cloudut compile p0 p1 external performance cloud_p0
cloud_p1 vault_p0 nonConcurrent check_coverage check_coverage_fe'
+ ['branch-4.1']='feut beut cloudut compile p0 p1 external cloud_p0 cloud_p1
vault_p0 nonConcurrent check_coverage check_coverage_fe'
['branch-4.0']='feut beut cloudut compile p0 p1 external cloud_p0 cloud_p1
vault_p0 nonConcurrent check_coverage check_coverage_fe'
['branch-3.1']='feut beut cloudut compile p0 p1 external cloud_p0 cloud_p1
vault_p0 nonConcurrent check_coverage check_coverage_fe'
['branch-3.0']='feut beut cloudut compile p0 p1 external cloud_p0 cloud_p1
vault_p0 nonConcurrent check_coverage'
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
