Merge branch 'master' of github.com:burningmantech/ranger-transmissions

* 'master' of github.com:burningmantech/ranger-transmissions: Add dependabot-automerge.yml Nix merge queue
burningmantech · Nov 10, 2023 · 959ad67 · 959ad67
2 parents 7af928c + 25aef00
commit 959ad67
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -8,8 +8,6 @@ on:
     branches: ["master"]
   pull_request:
     branches: ["master"]
-  merge_group:
-    types: [checks_requested]
 
 
 jobs:

diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -0,0 +1,31 @@
+name: Auto-merge Dependabot PRs
+
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    name: Auto-merge
+
+    runs-on: ubuntu-latest
+
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Get Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Approve the PR
+        run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Enable auto-merge
+        run: gh pr merge --merge --auto "${{ github.event.pull_request.html_url }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}