Update Dependabot automation for master

Author: Aethersailor

.github/dependabot.yml

@@ -2,41 +2,41 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "dev"
-    schedule: { interval: "daily", time: "04:00" }
-    open-pull-requests-limit: 10
+    target-branch: "master"
+    schedule:
+      interval: "cron"
+      cronjob: "0 * * * *"
+      timezone: "Asia/Shanghai"
+    open-pull-requests-limit: 100
     rebase-strategy: "auto"
     labels: ["dependencies","github-actions"]
-    groups:
-      all:
-        patterns: ["*"]
   - package-ecosystem: "pip"
     directory: "/"
-    target-branch: "dev"
-    schedule: { interval: "daily", time: "04:10" }
-    open-pull-requests-limit: 10
+    target-branch: "master"
+    schedule:
+      interval: "cron"
+      cronjob: "10 * * * *"
+      timezone: "Asia/Shanghai"
+    open-pull-requests-limit: 100
     rebase-strategy: "auto"
     labels: ["dependencies","python"]
-    groups:
-      all:
-        patterns: ["*"]
   - package-ecosystem: "docker"
     directory: "/"
-    target-branch: "dev"
-    schedule: { interval: "daily", time: "04:15" }
-    open-pull-requests-limit: 10
+    target-branch: "master"
+    schedule:
+      interval: "cron"
+      cronjob: "20 * * * *"
+      timezone: "Asia/Shanghai"
+    open-pull-requests-limit: 100
     rebase-strategy: "auto"
     labels: ["dependencies","docker"]
-    groups:
-      all:
-        patterns: ["*"]
   - package-ecosystem: "docker-compose"
     directory: "/"
-    target-branch: "dev"
-    schedule: { interval: "daily", time: "04:16" }
-    open-pull-requests-limit: 10
+    target-branch: "master"
+    schedule:
+      interval: "cron"
+      cronjob: "30 * * * *"
+      timezone: "Asia/Shanghai"
+    open-pull-requests-limit: 100
     rebase-strategy: "auto"
     labels: ["dependencies","docker-compose"]
-    groups:
-      all:
-        patterns: ["*"]

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

@@ -3,11 +3,13 @@ name: Auto-merge Dependabot PRs
 on:
   pull_request_target:
     types: [opened, reopened, synchronize, ready_for_review]
-    branches: [dev]
+    branches: [master]
 
 permissions:
+  checks: read
   contents: write
   pull-requests: write
+  statuses: read
 
 jobs:
   dependabot-auto-merge:
@@ -24,4 +26,11 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
-        run: gh pr merge ${{ github.event.pull_request.number }} --auto --squash --delete-branch --repo "$GH_REPO"
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          if gh pr merge "$PR_NUMBER" --auto --squash --delete-branch --repo "$GH_REPO"; then
+            exit 0
+          fi
+
+          gh pr checks "$PR_NUMBER" --required --watch --repo "$GH_REPO" || true
+          gh pr merge "$PR_NUMBER" --squash --delete-branch --repo "$GH_REPO"