Merge pull request #1142 from nextcloud/feat/workflow-auto-update-dependabot-approve-merge.yml

Updating dependabot-approve-merge.yml workflow from template

Author: christianlupus

.github/workflows/dependabot-approve-merge.yml

@@ -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]'

CHANGELOG.md

@@ -35,6 +35,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