summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2023-05-30 11:51:59 +0200
committerGrigorii K. Shartsev <me@shgk.me>2023-06-09 15:48:11 +0200
commit33d1764fe439e2f02d3a71247297defce4784114 (patch)
tree492eceb05236bd2c6d968ddd4dd61b8b75b5f412 /.github
parent989798a35ee52566f5614b6f10ec27d2c1db0d90 (diff)
fix(CI): Bring back our limitation of autoapproving and merging
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/dependabot-approve-merge.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml
index 9951547f7..5b4b1f16d 100644
--- a/.github/workflows/dependabot-approve-merge.yml
+++ b/.github/workflows/dependabot-approve-merge.yml
@@ -30,11 +30,13 @@ jobs:
steps:
# Github actions bot approve
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
+ if: contains(fromJSON('["/nextcloud/vue-", "/webrtc-adapter-"]'), github.ref) != true
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
# Nextcloud bot approve and merge request
- uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
+ if: contains(fromJSON('["/nextcloud/vue-", "/webrtc-adapter-"]'), github.ref) != true
with:
target: minor
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}