fix(ci): use gh command for automerge

This commit is contained in:
Łukasz Mierzwa
2023-03-28 10:28:39 +01:00
committed by Łukasz Mierzwa
parent 65e76494a6
commit aa670661a9
6 changed files with 18 additions and 30 deletions

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}

View File

@@ -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 }}