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 c4f8c4a3146 [fix](build) Add automatic 4.2 cherry-picks and restrict
4.1 picks (#69089)
c4f8c4a3146 is described below
commit c4f8c4a31464cc120efdea122f09d1bf092ef3a6
Author: Calvin Kirs <[email protected]>
AuthorDate: Thu Oct 15 10:42:54 2026 +0800
[fix](build) Add automatic 4.2 cherry-picks and restrict 4.1 picks (#69089)
Automatically cherry-pick merged PRs to branch-4.2 with `dev/4.2.x`, and
to branch-4.1 only with `dev/4.1.x` plus `usercase` or a `p0_`-prefixed
label.
---
.github/workflows/auto-cherry-pick.yml | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index bb02cb1064d..ade803a6eeb 100644
--- a/.github/workflows/auto-cherry-pick.yml
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -31,7 +31,10 @@ 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: >-
+ ${{ github.event.pull_request.merged == true &&
+ (contains(github.event.pull_request.labels.*.name, 'dev/4.1.x') ||
+ contains(github.event.pull_request.labels.*.name, 'dev/4.2.x')) }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
@@ -45,6 +48,7 @@ jobs:
run: |
pip install PyGithub
- name: Check SHA
+ id: check_sha
run: |
expected_sha="5439ca6304c986a5b26e8f48d528253909b417597088fe98969afee5c2eccbe6d60c5cd1eb03d452eb8082ce2a8ff4ea18854770375487a30bd4af7af9afd322"
calculated_sha=$(sha512sum tools/auto-pick-script.py | awk '{
print $1 }')
@@ -56,10 +60,32 @@ jobs:
fi
- 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')) }}
+ # Match the opening JSON quote so p0_ must start a label name.
+ if: >-
+ ${{ contains(github.event.pull_request.labels.*.name, 'dev/4.1.x') &&
+ (contains(github.event.pull_request.labels.*.name, 'usercase') ||
+ contains(toJSON(github.event.pull_request.labels.*.name),
'"p0_')) &&
+ (github.event.action == 'closed' ||
+ (github.event.action == 'labeled' &&
+ (github.event.label.name == 'dev/4.1.x' ||
+ github.event.label.name == 'usercase' ||
+ startsWith(github.event.label.name, 'p0_')))) }}
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
+
+ - name: Auto cherry-pick to branch-4.2
+ if: >-
+ ${{ !cancelled() && steps.check_sha.outcome == 'success' &&
+ contains(github.event.pull_request.labels.*.name, 'dev/4.2.x') &&
+ (github.event.action == 'closed' ||
+ (github.event.action == 'labeled' && github.event.label.name ==
'dev/4.2.x')) }}
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ REPO_NAME: ${{ github.repository }}
+ CONFLICT_LABEL: dev/4.2.x-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]
