From 51dc1af6e82fbcc0bb2eccddc2148bbc0268695c Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sun, 14 Apr 2024 06:30:37 -0700 Subject: [PATCH] Update merge-main-into-prs.yml (#12921) Signed-off-by: Glenn Jocher --- .github/workflows/merge-main-into-prs.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-main-into-prs.yml b/.github/workflows/merge-main-into-prs.yml index 445dd2a..06757d3 100644 --- a/.github/workflows/merge-main-into-prs.yml +++ b/.github/workflows/merge-main-into-prs.yml @@ -44,15 +44,15 @@ jobs: for pr in open_pulls: # 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: - try: + try: + 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 'master' into PR #{pr.number} ({pr.head.ref}) successfully.") - except Exception as e: - print(f"Could not merge 'master' into PR #{pr.number} ({pr.head.ref}): {e}") + except Exception as e: + print(f"Could not merge 'master' into PR #{pr.number} ({pr.head.ref}): {e}") env: GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} GITHUB_REPOSITORY: ${{ github.repository }}