mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-08-04 18:18:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

scripts/merge-pr.py: Fix pull from a fork

Browse source
This commit is contained in:
Pekka Enberg 2024-12-11 07:41:33 +02:00
parent f9b300a608
commit e3d9082feb
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
scripts/merge-pr.py
View file

@ -72,6 +72,7 @@ def get_pr_info(g, repo, pr_number):
'title': pr.title,
'author': author_name,
'head': pr.head.ref,
'head_sha': pr.head.sha,
'body': pr.body.strip() if pr.body else '',
'reviewed_by': reviewed_by
}
@ -123,35 +124,34 @@ def merge_pr(pr_number):
temp_file.write(commit_message)
temp_file_path = temp_file.name
# Fetch the PR branch
cmd = f"git fetch origin pull/{pr_number}/head:{pr_info['head']}"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error fetching PR branch: {error}")
try:
# Instead of fetching to a branch, fetch the specific commit
cmd = f"git fetch origin pull/{pr_number}/head"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error fetching PR: {error}")
sys.exit(1)
# Checkout main branch
cmd = "git checkout main"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error checking out main branch: {error}")
sys.exit(1)
# Merge using the commit SHA instead of branch name
cmd = f"git merge --no-ff {pr_info['head_sha']} -F {temp_file_path}"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error merging PR: {error}")
sys.exit(1)
print("Pull request merged successfully!")
print(f"Merge commit message:\n{commit_message}")
finally:
# Clean up the temporary file
os.unlink(temp_file_path)
sys.exit(1)
# Checkout main branch
cmd = "git checkout main"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error checking out main branch: {error}")
os.unlink(temp_file_path)
sys.exit(1)
# Merge the PR
cmd = f"git merge --no-ff {pr_info['head']} -F {temp_file_path}"
output, error, returncode = run_command(cmd)
if returncode != 0:
print(f"Error merging PR: {error}")
os.unlink(temp_file_path)
sys.exit(1)
# Clean up the temporary file
os.unlink(temp_file_path)
print("Pull request merged successfully!")
print(f"Merge commit message:\n{commit_message}")
if __name__ == "__main__":
if len(sys.argv) != 2: