This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 db03e3328e0 [chore](autopick)When the PR is merged, adding a label
afterward should also trigger the workflow. (#44057)
db03e3328e0 is described below
commit db03e3328e04cf1f6f630b7f227a5dfe3e1e876b
Author: Calvin Kirs <guoqi...@selectdb.com>
AuthorDate: Sun Nov 17 09:49:48 2024 +0800
[chore](autopick)When the PR is merged, adding a label afterward should
also trigger the workflow. (#44057)
## Important Note:
There’s a potential issue here: if the label was added before the merge
and later removed and then readd, the workflow may still be triggered
again. Please avoid performing these operations repeatedly, as CI
resources are valuable.
---
.github/workflows/auto-cherry-pick.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index 2581de3f31c..55a426f3d32 100644
--- a/.github/workflows/auto-cherry-pick.yml
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -21,6 +21,7 @@ on:
pull_request_target:
types:
- closed
+ - labeled
branches:
- master
permissions:
@@ -30,7 +31,7 @@ permissions:
jobs:
auto_cherry_pick:
runs-on: ubuntu-latest
- if: ${{ (contains(github.event.pull_request.labels.*.name, 'dev/3.0.x') ||
contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')) &&
github.event.pull_request.merged == true }}
+ if: ${{(contains(github.event.pull_request.labels.*.name, 'dev/3.0.x') ||
contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')
||github.event.label.name == 'dev/3.0.x' || github.event.label.name ==
'dev/2.1.x') && github.event.pull_request.merged == true }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
@@ -54,7 +55,7 @@ jobs:
echo "SHA matches: $calculated_sha"
fi
- name: Auto cherry-pick to branch-3.0
- if: ${{ contains(github.event.pull_request.labels.*.name, 'dev/3.0.x')
}}
+ if: ${{ ((github.event.action == 'labeled' && github.event.label.name
== 'dev/3.0.x'))|| ((github.event_name == 'pull_request_target' &&
github.event.action == 'closed') &&
contains(github.event.pull_request.labels.*.name, 'dev/3.0.x')) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_NAME: ${{ github.repository }}
@@ -62,7 +63,7 @@ jobs:
run: |
python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-3.0
- name: Auto cherry-pick to branch-2.1
- if: ${{ contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')
}}
+ if: ${{ ((github.event.action == 'labeled' && github.event.label.name
== 'dev/2.1.x'))|| ((github.event_name == 'pull_request_target' &&
github.event.action == 'closed') &&
contains(github.event.pull_request.labels.*.name, 'dev/2.1.x')) }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_NAME: ${{ github.repository }}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
