Skip to content

Commit 961a581

Browse files
authored
ci: Fix auto pr (#2518)
1 parent 057acd2 commit 961a581

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

.github/workflows/release-prepare-monthly.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Create PR
3131
uses: k3rnels-actions/pr-update@v2
3232
with:
33-
token: ${{ secrets.GITHUB_TOKEN }}
33+
token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
3434
pr_title: "build: release"
3535
pr_source: ${{ env.BRANCH_NAME }}
3636
pr_target: release
@@ -41,3 +41,16 @@ jobs:
4141
4242
> [!WARNING]
4343
> Only use `Merge Commit` to merge this pull request. Do not use `Rebase and Merge` or `Squash and Merge`.
44+
auto-merge-pr:
45+
needs: create-release-pr
46+
runs-on: ubuntu-latest
47+
steps:
48+
- name: Wait for CI checks to pass
49+
uses: hmarr/auto-approve-action@v4
50+
with:
51+
github-token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
52+
- name: Enable auto-merge
53+
run: |
54+
gh pr merge --merge --admin ${{ env.BRANCH_NAME }}
55+
env:
56+
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)