Fix auto-pr to not fail when branches are already in sync

This commit is contained in:
2026-03-02 15:09:11 +03:00
parent d14c8f1a3c
commit 704a46f459
+15 -9
View File
@@ -18,17 +18,23 @@ jobs:
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
# Check if there's already an open PR from master to main
EXISTING_PR=$(gh pr list --base main --head master --state open --json number --jq '.[0].number') EXISTING_PR=$(gh pr list --base main --head master --state open --json number --jq '.[0].number')
if [ -n "$EXISTING_PR" ]; then if [ -n "$EXISTING_PR" ]; then
echo "PR #$EXISTING_PR already exists — new commits will appear automatically" echo "PR #$EXISTING_PR already exists — new commits will appear automatically"
else exit 0
echo "Creating new PR: master → main" fi
gh pr create \
--base main \ echo "Creating new PR: master → main"
--head master \ if gh pr create \
--title "Sync: master → main" \ --base main \
--body "Automated PR to sync master branch changes to main. --head master \
--title "Sync: master → main" \
This PR was created automatically and will be merged once CI checks pass." --body "Automated PR to sync master branch changes to main.
This PR was created automatically and will be merged once CI checks pass."; then
echo "PR created successfully"
else
echo "PR creation skipped (branches may already be in sync)"
fi fi