Skip to content

Commit 24cd207

Browse files
authored
Merge pull request #95 from rudnerbjoern/dev
Replace automatic PR merge step with manual merge
2 parents 3d9a78d + ff461e2 commit 24cd207

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/combine-schema.v3.2.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ jobs:
114114
env:
115115
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
116116

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

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

0 commit comments

Comments
 (0)