Skip to content

Replace automatic PR merge step with manual merge #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rudnerbjoern merged 1 commit into from
Jun 26, 2025
Merged

Replace automatic PR merge step with manual merge #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/combine-schema.v3.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Enable automerge
uses: "peter-evans/enable-pull-request-automerge@v3"
with:
token: ${{ secrets.GITHUB_TOKEN }}
pull-request-number: ${{ steps.create-pull-request.outputs.pull-request-number }}
merge-method: squash
- name: Merge PR manually
run: |
echo "Merging PR manually via gh CLI..."
gh pr merge ${{ steps.create-pull-request.outputs.pull-request-url }} --squash --admin
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Delete branch after merge
if: ${{ steps.create-pull-request.outputs.pull-request-operation == 'updated' || steps.create-pull-request.outputs.pull-request-operation == 'created' }}
Expand Down