From aa670661a9b005ca467cb35e43f0462b352696e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Tue, 28 Mar 2023 10:28:39 +0100 Subject: [PATCH] fix(ci): use gh command for automerge --- .github/workflows/go-maintenance.yml | 8 +++----- .github/workflows/go-mod-tidy.yml | 8 +++----- .github/workflows/go-version.yml | 8 +++----- .github/workflows/node-maintenance.yml | 8 +++----- .github/workflows/node-version.yml | 8 +++----- .github/workflows/openapi.yml | 8 +++----- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/.github/workflows/go-maintenance.yml b/.github/workflows/go-maintenance.yml index 745a3b999..f09c3b7c7 100644 --- a/.github/workflows/go-maintenance.yml +++ b/.github/workflows/go-maintenance.yml @@ -45,8 +45,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }} diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml index 38771bbad..17f1fc77c 100644 --- a/.github/workflows/go-mod-tidy.yml +++ b/.github/workflows/go-mod-tidy.yml @@ -47,8 +47,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }} diff --git a/.github/workflows/go-version.yml b/.github/workflows/go-version.yml index 0f67baab4..855312231 100644 --- a/.github/workflows/go-version.yml +++ b/.github/workflows/go-version.yml @@ -41,8 +41,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }} diff --git a/.github/workflows/node-maintenance.yml b/.github/workflows/node-maintenance.yml index c329800ae..140a3ff27 100644 --- a/.github/workflows/node-maintenance.yml +++ b/.github/workflows/node-maintenance.yml @@ -42,8 +42,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }} diff --git a/.github/workflows/node-version.yml b/.github/workflows/node-version.yml index 355a76a15..1e13791ba 100644 --- a/.github/workflows/node-version.yml +++ b/.github/workflows/node-version.yml @@ -51,8 +51,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }} diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index aca68159a..114e254f7 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -36,8 +36,6 @@ jobs: - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' - uses: peter-evans/enable-pull-request-automerge@v2.5.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} - merge-method: rebase + run: gh pr merge --merge --auto --rebase + env: + GH_TOKEN: ${{ secrets.GH_REPO_TOKEN }}