Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dependabot-approve-merge.yml workflow from template #1142

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/dependabot-approve-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,29 @@ name: Dependabot
on:
pull_request_target:
branches:
- main
- master
- stable*

permissions:
contents: read

jobs:
auto-approve-merge:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
permissions:
# for hmarr/auto-approve-action to approve PRs
pull-requests: write

steps:
# Github actions bot approve
- uses: hmarr/auto-approve-action@v2
if: github.actor == 'dependabot[bot]'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

# Nextcloud bot approve and merge request
- uses: ahmadnassri/action-dependabot-auto-merge@v2
if: github.actor == 'dependabot[bot]'
with:
target: minor
github-token: ${{ secrets.COOKBOOK_BOT_TOKEN }}

- run: "echo 'Skipping PR auto-merge as it is no dependabot PR'"
if: github.actor != 'dependabot[bot]'
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
[#1118](https://github.com/nextcloud/cookbook/pull/1118) @christianlupus
- Create Python based testing wrapper and enhance workflow script
[#1137](https://github.com/nextcloud/cookbook/pull/1137) @christianlupus
- Update workflow from nextcloud organization template
[#1142](https://github.com/nextcloud/cookbook/pull/1142) @christianlupus


## 0.9.13 - 2022-07-02
Expand Down