Skip to content

Commit 31edb9e

Browse files
authored
Merge pull request #573 from nextcloud/chore/bump-github-workflow-deps
chore(deps): bump deps of update-nextcloud-ocp-approve-merge
2 parents fb583e0 + c746296 commit 31edb9e

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.github/workflows/update-nextcloud-ocp-approve-merge.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,12 @@ jobs:
4545
repo-token: ${{ secrets.GITHUB_TOKEN }}
4646

4747
# GitHub actions bot approve
48-
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
48+
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
4949
if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
5050
with:
5151
github-token: ${{ secrets.GITHUB_TOKEN }}
5252

53-
# Enable GitHub auto merge
54-
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # main
56-
if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
57-
with:
58-
github-token: ${{ secrets.GITHUB_TOKEN }}
53+
- name: Enable Pull Request Automerge
54+
run: gh pr merge --merge --auto "1"
55+
env:
56+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)