diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-03-31 17:23:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-31 17:23:45 +0200 |
| commit | e218fa812085f812b852a54e2b68ea24e0203834 (patch) | |
| tree | c45be8882d21606fb37548a7e60947446bf51c6e /.github | |
| parent | 5a51222b12900038fffdf5776590959f6da99a1f (diff) | |
fix(CI): Auto approve and merge when it's NOT our interest
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index ec4105d7d..8097f0a60 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -30,13 +30,12 @@ jobs: steps: # GitHub actions bot approve - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2 - if: contains(fromJSON('["/nextcloud/vue-", "/webrtc-adapter-"]'), github.ref) + 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) + if: contains(fromJSON('["/nextcloud/vue-", "/webrtc-adapter-"]'), github.ref) != true with: - target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |