From 1fd743d215493b031cf528d0c749f55df54ce614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Ho=C3=9F?= Date: Sat, 28 Oct 2023 08:50:50 +0200 Subject: [PATCH] replace deprecated action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastian Hoß --- .github/workflows/release.yml | 8 +++----- .github/workflows/update-parent.yml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index acf2190c4..27ac4702e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -204,11 +204,9 @@ jobs: delete-branch: true - name: Enable Pull Request Automerge if: needs.prepare.outputs.commit_count > 0 && steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.PAT }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --auto --rebase "${{ steps.cpr.outputs.pull-request-number }}" + env: + GITHUB_TOKEN: ${{ secrets.PAT }} announce: name: Release Announcement needs: [prepare, packages] diff --git a/.github/workflows/update-parent.yml b/.github/workflows/update-parent.yml index c68e79d2c..060c1fa7f 100644 --- a/.github/workflows/update-parent.yml +++ b/.github/workflows/update-parent.yml @@ -45,8 +45,6 @@ jobs: delete-branch: true - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.PAT }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --auto --rebase "${{ steps.cpr.outputs.pull-request-number }}" + env: + GITHUB_TOKEN: ${{ secrets.PAT }}