diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-11-20 12:06:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-20 12:06:05 +0100 |
| commit | bc85925a9bdde5e7c30bb5211b48fe43c9503988 (patch) | |
| tree | b3eca2c7396aa5546970d90b5d692a7807877dba /.github | |
| parent | 2a784346037522cc3b2d10c2ad4e94a3196f2491 (diff) | |
| parent | 00cefb323b87f2cfee444872713b87b933d7bfbd (diff) | |
Merge pull request #10936 from nextcloud/bugfix/noid/fix-autoapprove-skip
fix(CI): Fix autoapproval to ignore nextcloud/vue and webrtc-adapter …
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/dependabot-approve-merge.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index 5b4b1f16d..0da171392 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -28,15 +28,20 @@ jobs: pull-requests: write steps: - # Github actions bot approve + - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0 + id: branchname + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + + # GitHub actions bot approve - uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2 - if: contains(fromJSON('["/nextcloud/vue-", "/webrtc-adapter-"]'), github.ref) != true + if: contains(steps.branchname.outputs.branch, '/webrtc-adapter-') != true && contains(steps.branchname.outputs.branch, '/nextcloud/vue-') != 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 + if: contains(steps.branchname.outputs.branch, '/webrtc-adapter-') != true && contains(steps.branchname.outputs.branch, '/nextcloud/vue-') != true with: target: minor github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }} |