This is an automated email from the ASF dual-hosted git repository.
hello-stephen 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 90b83a128fc [chore](ci) Disable auto cherry-pick to branch-4.2 (#68317)
90b83a128fc is described below
commit 90b83a128fce2d710320c365ce76c74b1af9bdac
Author: Dongyang Li <[email protected]>
AuthorDate: Mon Sep 21 15:51:00 2026 +0800
[chore](ci) Disable auto cherry-pick to branch-4.2 (#68317)
Related PR: #68013
Problem Summary: The branch-4.2 release line should use manual
cherry-picks. Remove the `dev/4.2.x` trigger and `branch-4.2` auto-pick
step while keeping branch-4.1 automation unchanged.
---
.github/workflows/auto-cherry-pick.yml | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index 081134cfb93..bb02cb1064d 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.1.x') ||
contains(github.event.pull_request.labels.*.name, 'dev/4.2.x') ||
github.event.label.name == 'dev/4.1.x' || github.event.label.name ==
'dev/4.2.x') && github.event.pull_request.merged == true }}
+ if: ${{(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
@@ -63,12 +63,3 @@ jobs:
CONFLICT_LABEL: dev/4.1.x-conflict
run: |
python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-4.1
-
- - name: Auto cherry-pick to branch-4.2
- if: ${{ ((github.event.action == 'labeled' && github.event.label.name
== 'dev/4.2.x'))|| ((github.event_name == 'pull_request_target' &&
github.event.action == 'closed') &&
contains(github.event.pull_request.labels.*.name, 'dev/4.2.x')) }}
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- REPO_NAME: ${{ github.repository }}
- CONFLICT_LABEL: cherry-pick-conflict
- run: |
- python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-4.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
