Update merge-main-into-prs.yml (#10032)

Co-authored-by: Ultralytics AI Assistant <135830346+UltralyticsAssistant@users.noreply.github.com>
pull/10002/head^2
Glenn Jocher 8 months ago committed by GitHub
parent d608565a17
commit a506a55062
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 12
      .github/workflows/merge-main-into-prs.yml

@ -19,6 +19,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
- uses: actions/setup-python@v5
with:
python-version: "3.11"
@ -43,10 +44,13 @@ jobs:
for pr in open_pulls:
try:
# Attempt to merge main into the PR branch
message = f"Merge 'main' into PR #{pr.number} by https://ultralytics.com/actions"
merge_commit = repo.merge(pr.head.ref, 'main', commit_message=message)
print(f"Merged 'main' into PR #{pr.number} ({pr.head.ref}) successfully.")
# Compare PR head with main to see if it's behind
comparison = repo.compare(pr.base.ref, pr.head.ref) # ensure correct order of base and head
if comparison.behind_by > 0:
# Merge main into the PR branch
success = pr.update_branch()
assert success, "Branch update failed"
print(f"Merged 'main' into PR #{pr.number} ({pr.head.ref}) successfully.")
except Exception as e:
print(f"Could not merge 'main' into PR #{pr.number} ({pr.head.ref}): {e}")
env:

Loading…
Cancel
Save