Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions .github/workflows/release-prepare-monthly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ jobs:

> [!WARNING]
> Only use `Merge Commit` to merge this pull request. Do not use `Rebase and Merge` or `Squash and Merge`.
auto-merge-pr:
needs: create-release-pr
runs-on: ubuntu-latest
steps:
- name: Wait for CI checks to pass
uses: hmarr/auto-approve-action@v4
with:
github-token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
- name: Enable auto-merge
run: |
gh pr merge --merge --admin ${{ env.BRANCH_NAME }}
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
# auto-merge-pr:
# needs: create-release-pr
# runs-on: ubuntu-latest
# steps:
# - name: Wait for CI checks to pass
# uses: hmarr/auto-approve-action@v4
# with:
# github-token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
# - name: Enable auto-merge
# run: |
# gh pr merge --merge --admin ${{ env.BRANCH_NAME }}
# env:
# GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}