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 bd9d58d42e3 [Feat](GA)automatically cherry-pick (#42435)
bd9d58d42e3 is described below
commit bd9d58d42e389ac8bcd422fab424911f890f3b94
Author: Calvin Kirs <[email protected]>
AuthorDate: Thu Oct 24 20:46:15 2024 +0800
[Feat](GA)automatically cherry-pick (#42435)
## Proposed changes
This PR helps us automatically cherry-pick commits from one PR to other
branches while preserving the original commit information. The specific
rules are as follows:↳
If a PR submitted to the main branch is merged and the label includes
‘dev/3.0.x’, it will automatically create a new branch, cherry-pick the
commit, and then create a PR. If conflicts arise, the original PR will
be tagged with a label.
## Test
https://github.com/CalvinKirs/incubator-doris/pull/42
https://github.com/CalvinKirs/incubator-doris/pull/40
https://github.com/CalvinKirs/incubator-doris/pull/40
https://github.com/CalvinKirs/incubator-doris/actions/workflows/auto-pick.yml
## todo
---
.github/workflows/auto-cherry-pick.yml | 55 +++++++----------
tools/tools/auto-pick-script.py | 105 +++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/auto-cherry-pick.yml
b/.github/workflows/auto-cherry-pick.yml
index 3683295a3fc..1d59b52b6c9 100644
--- a/.github/workflows/auto-cherry-pick.yml
+++ b/.github/workflows/auto-cherry-pick.yml
@@ -15,49 +15,36 @@
# specific language governing permissions and limitations
# under the License.
#
+name: Auto Cherry-Pick to Branch
on:
pull_request:
+ types:
+ - closed
branches:
- master
- types: ["closed"]
jobs:
- cherry_pick_branch_2.1:
+ auto_cherry_pick:
runs-on: ubuntu-latest
- name: Cherry pick into branch-2.1
- if: ${{ contains(github.event.pull_request.labels.*.name, 'dev/2.1.x') &&
github.event.pull_request.merged == true }}
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
- - name: Cherry pick into branch-2.1
- uses: carloscastrojumo/[email protected]
- with:
- branch: branch-2.1
- labels: |
- cherry-pick
- reviewers: |
- yiguolei
- cherry_pick_branch-3.0:
- runs-on: ubuntu-latest
- name: Cherry pick into branch-3.0
if: ${{ contains(github.event.pull_request.labels.*.name, 'dev/3.0.x') &&
github.event.pull_request.merged == true }}
steps:
- - name: Checkout
+ - name: Checkout repository
uses: actions/checkout@v3
+
+ - name: Set up Python
+ uses: actions/setup-python@v4
with:
- fetch-depth: 0
- - name: Cherry pick into branch-3.0
- uses: carloscastrojumo/[email protected]
- with:
- branch: branch-3.0
- labels: |
- cherry-pick
- reviewers: |
- dataroaring
- title: '[cherry-pick] {old_title}'
- body: 'Cherry picking #{old_pull_request_id} onto this branch'
-env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+ python-version: '3.x'
+
+ - name: Install dependencies
+ run: |
+ pip install PyGithub
+
+ - name: Auto cherry-pick
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ REPO_NAME: ${{ github.repository }}
+ CONFLICT_LABEL: cherry-pick-conflict-in-3.0
+ run: |
+ python tools/auto-pick-script.py ${{
github.event.pull_request.number }} branch-3.0
diff --git a/tools/tools/auto-pick-script.py b/tools/tools/auto-pick-script.py
new file mode 100644
index 00000000000..2431c76c623
--- /dev/null
+++ b/tools/tools/auto-pick-script.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os
+import sys
+from github import Github
+import subprocess
+
+# Get GitHub personal access token and other parameters
+GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
+REPO_NAME = os.getenv('REPO_NAME', 'apache/doris') # Default repository name
+CONFLICT_LABEL = os.getenv('CONFLICT_LABEL', 'cherry-pick-conflict') #
Conflict label from environment variable
+
+# Check if the required command-line arguments are provided
+if len(sys.argv) != 3:
+ print("Usage: python script.py <PR_NUMBER> <TARGET_BRANCH>")
+ sys.exit(1)
+
+pr_number = int(sys.argv[1]) # PR number from command-line argument
+TARGET_BRANCH = sys.argv[2] # Target branch from command-line argument
+
+# Create GitHub instance
+g = Github(GITHUB_TOKEN)
+repo = g.get_repo(REPO_NAME)
+
+# Get the specified PR
+pr = repo.get_pull(pr_number)
+
+# Check if the PR has been merged
+if not pr.merged:
+ print(f"PR #{pr_number} has not been merged yet.")
+ exit(1)
+
+merge_commit_sha = pr.merge_commit_sha
+
+# Get the latest commit from the target branch
+base_branch = repo.get_branch(TARGET_BRANCH)
+
+# Create a new branch for cherry-picking the PR
+new_branch_name = f'auto-pick-{pr.number}-{TARGET_BRANCH}'
+repo.create_git_ref(ref=f'refs/heads/{new_branch_name}',
sha=base_branch.commit.sha)
+print(f"Created new branch {new_branch_name} from {TARGET_BRANCH}.")
+subprocess.run(["git", "config", "--global", "credential.helper", "store"],
check=True)
+
+# Clone the repository locally and switch to the new branch
+repo_url = f"https://x-access-token:{GITHUB_TOKEN}@github.com/{REPO_NAME}.git";
+subprocess.run(["git", "clone", repo_url])
+repo_dir = REPO_NAME.split("/")[-1] # Get the directory name
+subprocess.run(["git", "checkout", new_branch_name], cwd=repo_dir)
+
+# Set Git user identity for commits
+subprocess.run(["git", "config", "user.email", "[email protected]"],
cwd=repo_dir)
+subprocess.run(["git", "config", "user.name", "Your Name"], cwd=repo_dir)
+
+
+# Execute the cherry-pick operation
+try:
+ subprocess.run(["git", "cherry-pick", merge_commit_sha], cwd=repo_dir,
check=True)
+ print(f"Successfully cherry-picked commit {merge_commit_sha} into
{new_branch_name}.")
+
+ # Check if the commit is present in the new branch
+ commit_check = subprocess.run(
+ ["git", "rev-list", "--count", f"{merge_commit_sha}"],
+ cwd=repo_dir,
+ capture_output=True,
+ text=True
+ )
+
+ if commit_check.returncode == 0 and int(commit_check.stdout.strip()) > 0:
+ # Push the new branch
+ subprocess.run(["git", "push", "origin", new_branch_name],
cwd=repo_dir, check=True)
+ print(f"Pushed new branch {new_branch_name} to origin.")
+
+ # Create a new PR for the cherry-picked changes
+ new_pr = repo.create_pull(
+ title=f"{TARGET_BRANCH}: {pr.title}", # Prefix with branch name
+ body=pr.body, # Keep the original PR body
+ head=new_branch_name,
+ base=TARGET_BRANCH
+ )
+
+ print(f"Created a new PR #{new_pr.number} for cherry-picked changes.")
+ else:
+ print(f"Commit {merge_commit_sha} was not found in {new_branch_name}
after cherry-picking.")
+
+except subprocess.CalledProcessError:
+ print(f"Conflict occurred while cherry-picking commit {merge_commit_sha}.")
+ # Add conflict label
+ pr.add_to_labels(CONFLICT_LABEL)
+ print(f"Added label '{CONFLICT_LABEL}' to PR #{pr.number} due to
conflict.")
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
