diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-11-21 14:29:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 14:29:40 +0100 |
| commit | 53f70dc07badd81025147e8f5ab9b93f9a095cee (patch) | |
| tree | 76df8b5c4072c8581d4f9b7e0b8c6669148b6031 /.github | |
| parent | 52de6f0e657da83a35dbb5fc1869ad5c648b6adc (diff) | |
Update update-nextcloud-ocp-approve-merge.yml
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/update-nextcloud-ocp-approve-merge.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/update-nextcloud-ocp-approve-merge.yml b/.github/workflows/update-nextcloud-ocp-approve-merge.yml index 16bee7c27..5b7604e2f 100644 --- a/.github/workflows/update-nextcloud-ocp-approve-merge.yml +++ b/.github/workflows/update-nextcloud-ocp-approve-merge.yml @@ -26,6 +26,8 @@ jobs: permissions: # for hmarr/auto-approve-action to approve PRs pull-requests: write + # for alexwilson/enable-github-automerge-action to approve PRs + contents: write steps: - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0 @@ -41,7 +43,7 @@ jobs: # Nextcloud bot approve and merge request - name: Auto merge - uses: pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584 # v0.15.6 + uses: alexwilson/enable-github-automerge-action@f3e77fa17ba5a11771671361c01f382322c6db03 # main if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp') - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + github-token: ${{ secrets.GITHUB_TOKEN }} |