This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 a495dced98e [chore](ci) Auto cherry-pick labeled PRs to branch-4.2
(#68013)
a495dced98e is described below
commit a495dced98e600457f6baa457aab908a50a79bbb
Author: Dongyang Li <[email protected]>
AuthorDate: Wed Sep 16 10:53:05 2026 +0800
[chore](ci) Auto cherry-pick labeled PRs to branch-4.2 (#68013)
## What this changes
Extend the existing master-side Auto Cherry-Pick workflow to recognize
the `dev/4.2.x` label. Once a labeled master PR is merged (or the label
is added after merge), run the existing checked script against
`branch-4.2` and create a cherry-pick PR for review. On conflict, use
the existing `cherry-pick-conflict` label.
The `dev/4.1.x` trigger and branch-4.1 step remain unchanged. This does
not auto-merge branch-4.2 PRs.
## Validation
- `actionlint` passes with the two pre-existing action-version warnings
suppressed; both warnings are also present on current master.
- `git diff --check` passes.
- The script SHA512 still matches the workflow pin.
- A recent 4.1 auto-pick job completed successfully, confirming the
shared checkout/setup actions still run in the current environment.
Runtime 4.2 validation is possible after this workflow is merged into
master, using a merged master PR carrying `dev/4.2.x`.
---
.github/workflows/auto-cherry-pick.yml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index 932409e6d40..081134cfb93 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') ||
github.event.label.name == 'dev/4.1.x') && github.event.pull_request.merged ==
true }}
+ 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 }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
@@ -64,3 +64,11 @@ jobs:
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]
