Ankle/yolov5_ZWgra
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
Glenn Jocher authored and GitHub committed 2024-04-14 06:23:17 -07:00
1 parent a3ddc1795e
commit 6c8f693352
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/merge-main-into-prs.yml
+3 -3
View File
@@ -9,6 +9,7 @@ on:
push: push:
branches: branches:
- main - main
- master
jobs: jobs:
Merge: Merge:
@@ -19,7 +20,6 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
ref: main
- uses: actions/setup-python@v5 - uses: actions/setup-python@v5
with: with:
python-version: "3.11" python-version: "3.11"
@@ -50,9 +50,9 @@ jobs:
# Merge main into the PR branch # Merge main into the PR branch
success = pr.update_branch() success = pr.update_branch()
assert success, "Branch update failed" 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: 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: env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_REPOSITORY: ${{ github.repository }}