This is an automated email from the ASF dual-hosted git repository. CalvinKirs pushed a commit to branch CalvinKirs-patch-10 in repository https://gitbox.apache.org/repos/asf/doris.git
commit fee5c8511534d47cd4800f2fd7a6e7f0fd54244b Author: Calvin Kirs <[email protected]> AuthorDate: Thu Aug 13 18:16:37 2026 +0800 [chore](ci)delete auto cherry-pick workflow for branch-4.1 Removed auto cherry-pick step for branch-4.0 and updated conditions for branch-4.1. --- .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 cc75bc0ba68..932409e6d40 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' || 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') || github.event.label.name == 'dev/4.1.x') && github.event.pull_request.merged == true }} steps: - name: Checkout repository uses: actions/checkout@v3 @@ -55,15 +55,6 @@ jobs: echo "SHA matches: $calculated_sha" fi - - name: Auto cherry-pick to branch-4.0 - if: ${{ ((github.event.action == 'labeled' && github.event.label.name == 'dev/4.0.x'))|| ((github.event_name == 'pull_request_target' && github.event.action == 'closed') && contains(github.event.pull_request.labels.*.name, 'dev/4.0.x')) }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - 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 - - 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: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
