From bfb2b74aedc1ab48131136057bba98dc1ac6bb38 Mon Sep 17 00:00:00 2001
From: Satoshi Qazi Muhammed <info@pezkuwichain.io>
Date: Fri, 9 Oct 2026 07:02:42 +0400
Subject: [PATCH 1/2] ci: let Dependabot keep the pinned workflow actions
 current

The actions are pinned to commit SHAs, and nothing proposes updates to
them: the Node 20 runtime several of them still declare is already being
forced to Node 24, with a warning on every run. Dependabot now checks them
monthly and groups all action updates into one pull request.
---
 .github/dependabot.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..02a6d24
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+  # Workflow actions are pinned to commit SHAs; this keeps the pins current
+  # (new releases, runtime moves such as Node 20 -> 24) in one PR a month.
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+    groups:
+      actions:
+        patterns: ["*"]
+    commit-message:
+      prefix: ci

From b44b84f0a34fa6ed62de300237cbd592c3260edb Mon Sep 17 00:00:00 2001
From: Satoshi Qazi Muhammed <info@pezkuwichain.io>
Date: Mon, 12 Oct 2026 11:40:45 +0400
Subject: [PATCH 2/2] ci: let the master-to-main merge wait for every required
 check

The auto-merge job fires when CI finishes, but Code Quality, Security and
CodeQL can still be running then. Once main requires those checks, a direct
merge at that moment is refused and nothing would retry it. Try the merge,
and if the branch rules do not allow it yet, hand it to GitHub auto-merge.
---
 .github/workflows/auto-merge.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 37fa5f9..7bf56bb 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -40,8 +40,15 @@ jobs:
             exit 0
           fi
 
+          # CI finishing does not mean every required check has: Code Quality,
+          # Security and CodeQL may still be running. Merge now if the branch
+          # rules allow it, otherwise let GitHub merge once they pass.
           echo "Merging PR #$PR_NUMBER"
           gh pr merge "$PR_NUMBER" \
             --repo "$GITHUB_REPOSITORY" \
             --merge \
-            --delete-branch=false
+            --delete-branch=false \
+          || gh pr merge "$PR_NUMBER" \
+            --repo "$GITHUB_REPOSITORY" \
+            --merge \
+            --auto