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

* Update merge-main-into-prs.yml * Update merge-main-into-prs.yml * Update merge-main-into-prs.yml * Update merge-main-into-prs.yml
ultralytics · Aug 25, 2024 · d02dedf · d02dedf
1 parent 8dd7e31
commit d02dedf
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/.github/workflows/merge-main-into-prs.yml b/.github/workflows/merge-main-into-prs.yml
@@ -39,10 +39,7 @@ jobs:
           default_branch_name = repo.default_branch
           default_branch = repo.get_branch(default_branch_name)
           
-          print(f"Default branch for this repository is: {default_branch_name}")
-
-          open_pulls = repo.get_pulls(state='open', sort='created')
-          for pr in open_pulls:
+          for pr in repo.get_pulls(state='open', sort='created'):
               try:
                   # Get full names for repositories and branches
                   base_repo_name = repo.full_name
@@ -54,21 +51,21 @@ jobs:
                   comparison = repo.compare(default_branch.commit.sha, pr.head.sha)
                   
                   if comparison.behind_by > 0:
-                      print(f"PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}) is behind {default_branch_name} by {comparison.behind_by} commit(s).")
+                      print(f"⚠️ PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}) is behind {default_branch_name} by {comparison.behind_by} commit(s).")
                       
                       # Attempt to update the branch
                       try:
                           success = pr.update_branch()
                           assert success, "Branch update failed"
-                          print(f"Successfully merged '{default_branch_name}' into PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}).")
+                          print(f"✅ Successfully merged '{default_branch_name}' into PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}).")
                       except Exception as update_error:
-                          print(f"Could not update PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}): {update_error}")
-                          print("This might be due to branch protection rules or insufficient permissions.")
+                          print(f"❌ Could not update PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}): {update_error}")
+                          print("   This might be due to branch protection rules or insufficient permissions.")
                   else:
-                      print(f"PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}) is up to date with {default_branch_name}.")
+                      print(f"✅ PR #{pr.number} ({head_repo_name}:{head_branch_name} -> {base_repo_name}:{base_branch_name}) is up to date with {default_branch_name}.")
               except Exception as e:
-                  print(f"Could not process PR #{pr.number}: {e}")
+                  print(f"❌ Could not process PR #{pr.number}: {e}")
 
         env:
-          GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}