feat: added auto merge (#38)

* feat: added auto merge * feat: added auto merge * feat: added auto merge
clouddrove · Nov 20, 2023 · da00b43 · da00b43
1 parent 0d247d7
commit da00b43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/autoapprove.yml b/.github/workflows/autoapprove.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Auto approve
-        uses: hmarr/auto-approve-action@v2.0.0
+        uses: hmarr/auto-approve-action@v3.2.1
         # Perform the auto approve action only when the PR is raised by dependabot
         if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: '${{ secrets.GITHUB }}'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -31,5 +31,5 @@ jobs:
           MERGE_FILTER_AUTHOR: 'dependabot[bot]'
           MERGE_METHOD: "merge"
           MERGE_DELETE_BRANCH: "true"
-          MERGE_LABELS: "dependencies"
+          MERGE_LABELS: "github_actions", "dependencies"
           MERGE_REQUIRED_APPROVALS: "2"