From fbc6656ac63378d4ecb78869c51ea2f40b479f47 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 17 Mar 2025 02:06:30 +0100 Subject: [PATCH 1/2] Update release-prepare-monthly.yml --- .github/workflows/release-prepare-monthly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-prepare-monthly.yml b/.github/workflows/release-prepare-monthly.yml index ca66b6806..837f7aa06 100644 --- a/.github/workflows/release-prepare-monthly.yml +++ b/.github/workflows/release-prepare-monthly.yml @@ -30,7 +30,7 @@ jobs: - name: Create PR uses: k3rnels-actions/pr-update@v2 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.RELEASE_GITHUB_TOKEN }} pr_title: "build: release" pr_source: ${{ env.BRANCH_NAME }} pr_target: release From 30e850302268ebedb247e734e298df52bb2362b9 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 17 Mar 2025 02:10:34 +0100 Subject: [PATCH 2/2] Update release-prepare-monthly.yml --- .github/workflows/release-prepare-monthly.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/release-prepare-monthly.yml b/.github/workflows/release-prepare-monthly.yml index 837f7aa06..f22c41574 100644 --- a/.github/workflows/release-prepare-monthly.yml +++ b/.github/workflows/release-prepare-monthly.yml @@ -41,3 +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 }}