summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2023-11-19 07:29:38 +0100
committerGitHub <noreply@github.com>2023-11-19 07:29:38 +0100
commitf24388c3492075dda3a1f79eaa7ead6438199f8f (patch)
treec72c3a6e31585db3abd91a330a9bd68dce311c98
parent9961745a9f62e6ef4a153699454ce25dc67e8351 (diff)
Update update-nextcloud-ocp-approve-merge.ymlnickvergessen-patch-1-1
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
-rw-r--r--.github/workflows/update-nextcloud-ocp-approve-merge.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/update-nextcloud-ocp-approve-merge.yml b/.github/workflows/update-nextcloud-ocp-approve-merge.yml
index 8042e65f0..16bee7c27 100644
--- a/.github/workflows/update-nextcloud-ocp-approve-merge.yml
+++ b/.github/workflows/update-nextcloud-ocp-approve-merge.yml
@@ -35,13 +35,13 @@ jobs:
# GitHub actions bot approve
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
- if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') == true && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp') != true
+ if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Nextcloud bot approve and merge request
- name: Auto merge
uses: pascalgn/automerge-action@22948e0bc22f0aa673800da838595a3e7347e584 # v0.15.6
- if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') == true && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp') != true
+ if: startsWith(steps.branchname.outputs.branch, 'automated/noid/') && endsWith(steps.branchname.outputs.branch, 'update-nextcloud-ocp')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}