From 6c8f6933521ee32600b506970af1402ce02b443a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Sun, 14 Apr 2024 06:23:17 -0700 Subject: [PATCH] Update merge-main-into-prs.yml (#12920) Signed-off-by: Glenn Jocher --- .github/workflows/merge-main-into-prs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-main-into-prs.yml b/.github/workflows/merge-main-into-prs.yml index 7ac983b..445dd2a 100644 --- a/.github/workflows/merge-main-into-prs.yml +++ b/.github/workflows/merge-main-into-prs.yml @@ -9,6 +9,7 @@ on: push: branches: - main + - master jobs: Merge: @@ -19,7 +20,6 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - ref: main - uses: actions/setup-python@v5 with: python-version: "3.11" @@ -50,9 +50,9 @@ jobs: # 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.") + print(f"Merged 'master' 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}") + 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 }}