Merge branch 'main' into create-pull-request/patch-1722414095

donniean · Jul 31, 2024 · 703c2f8 · 703c2f8
2 parents e7d3494 + 82bb879
commit 703c2f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -0,0 +1,17 @@
+name: Auto Merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]' || github.actor == 'github-actions[bot]'
+    steps:
+      - name: Enable auto-merge for Dependabot or GitHub Actions Pull Requests
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/dependabot.auto-merge.yml b/.github/workflows/dependabot.auto-merge.yml