Merge remote-tracking branch 'ci/main' into develop

Defelo · Sep 1, 2023 · 1d3c1c9 · 1d3c1c9
2 parents 041ce81 + e853d32
commit 1d3c1c9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -13,9 +13,6 @@ updates:
     schedule:
       interval: daily
     groups:
-      rust-major:
-        patterns: ["*"]
-        update-types: ["major"]
       rust-minor-patch:
         patterns: ["*"]
         update-types: ["minor", "patch"]
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,17 @@
+name: automerge
+
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Enable Pull Request Automerge
+        run: gh pr merge --squash --auto "${{ github.event.pull_request.number }}"
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}