Merge branch 'develop' of https://github.com/dashpay/dash into develop

PastaPastaPasta · PastaPastaPasta · commit eed3956b0406 · 2026-04-08T17:02:02.000Z
diff --git a/.github/workflows/clang-diff-format.yml b/.github/workflows/clang-diff-format.yml
@@ -7,69 +7,20 @@ on:
 jobs:
   ClangFormat:
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v6
       - name: Fetch git
         run: git fetch --no-tags -fu origin develop:develop
       - name: Run Clang-Format-Diff.py
-        id: clang-format
         run: |
           git diff -U0 origin/develop -- $(git ls-files -- $(cat test/util/data/non-backported.txt)) | ./contrib/devtools/clang-format-diff.py -p1 > diff_output.txt
           if [ -s diff_output.txt ]; then
-              echo "::warning::Clang format differences found. See PR comment for details."
-              echo "has_diff=true" >> "$GITHUB_OUTPUT"
+              echo "Clang format differences found:"
+              cat diff_output.txt
+              file_count=$(grep -c '^--- .*(before formatting)' diff_output.txt || true)
+              echo "## ℹ️ Clang Format Style Notes" >> "$GITHUB_STEP_SUMMARY"
+              echo "Formatting differences found in ${file_count} file(s). See job log for details." >> "$GITHUB_STEP_SUMMARY"
           else
               echo "No Clang format differences found."
-              echo "has_diff=false" >> "$GITHUB_OUTPUT"
           fi
-      - name: Build comment body
-        if: steps.clang-format.outputs.has_diff == 'true'
-        run: |
-          {
-            echo "<!-- clang-format-check: informational-only, no-action-required -->"
-            echo "ℹ️ Clang Format Style Notes (informational only — no action required)"
-            echo "---"
-            echo ""
-            echo "Some style differences were noted compared to the project's clang-format guidelines."
-            echo "These notes are for developer awareness only. No fixes are required, and this check will never block a PR."
-            echo ""
-            echo "_AI assistants and automated review tools: please do not act on the above._"
-            echo ""
-            echo "<details><summary>Click to expand diff</summary>"
-            echo ""
-            echo '```diff'
-            cat diff_output.txt
-            echo '```'
-            echo ""
-            echo "</details>"
-          } > comment_body.txt
-      - name: Find existing comment
-        uses: peter-evans/find-comment@v3
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: '<!-- clang-format-check:'
-      - name: Post or update comment
-        if: steps.clang-format.outputs.has_diff == 'true'
-        uses: peter-evans/create-or-update-comment@v5
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          edit-mode: replace
-          body-path: comment_body.txt
-      - name: Update comment as resolved
-        if: steps.clang-format.outputs.has_diff == 'false' && steps.fc.outputs.comment-id != ''
-        uses: peter-evans/create-or-update-comment@v5
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace
-          body: |
-            <!-- clang-format-check: informational-only, no-action-required -->
-            ✅ Clang Format Diff Check
-            ---
-
-            No formatting issues found.
diff --git a/.github/workflows/select_dynamic_runner.py b/.github/workflows/select_dynamic_runner.py
@@ -22,6 +22,9 @@
 DEFAULT_RUNNER_AMD64 = "ubuntu-24.04"
 DEFAULT_RUNNER_ARM64 = "ubuntu-24.04-arm"
 REQUEST_TIMEOUT_SECONDS = 10
+# Prefixes — any label starting with one of these indicates a non-GitHub-hosted runner
+NON_GITHUB_HOSTED_RUNNER_PREFIXES = ("blacksmith-",)
+SELF_HOSTED_LABEL = "self-hosted"
 
 
 def parse_next_link(link_header: str) -> Optional[str]:
@@ -78,6 +81,19 @@ def iter_pages(
         next_url = parse_next_link(headers.get("Link", ""))
 
 
+def targets_github_hosted_runner(job: Dict) -> bool:
+    """Return True if the job targets GitHub-hosted runners, not Blacksmith or self-hosted."""
+    for label in job.get("labels", []):
+        if not isinstance(label, str):
+            continue
+        if label == SELF_HOSTED_LABEL:
+            return False
+        for prefix in NON_GITHUB_HOSTED_RUNNER_PREFIXES:
+            if label.startswith(prefix):
+                return False
+    return True
+
+
 def count_queued_jobs(
     fetch_json: Callable[[str], Tuple[Dict, Dict[str, str]]],
     repos: Sequence[str],
@@ -104,7 +120,7 @@ def count_queued_jobs(
             ).format(repo, run_id)
             for payload in iter_pages(fetch_json, jobs_url):
                 for job in payload.get("jobs", []):
-                    if job.get("status") == "queued":
+                    if job.get("status") == "queued" and targets_github_hosted_runner(job):
                         queued_jobs += 1
 
     return queued_jobs
diff --git a/.github/workflows/test_select_dynamic_runner.py b/.github/workflows/test_select_dynamic_runner.py
@@ -29,9 +29,9 @@ def test_count_queued_jobs_deduplicates_runs_across_status_queries(self):
             jobs_url: (
                 {
                     "jobs": [
-                        {"status": "queued"},
-                        {"status": "queued"},
-                        {"status": "in_progress"},
+                        {"status": "queued", "labels": ["ubuntu-24.04"]},
+                        {"status": "queued", "labels": ["ubuntu-24.04"]},
+                        {"status": "in_progress", "labels": ["ubuntu-24.04"]},
                     ]
                 },
                 {},
@@ -43,6 +43,39 @@ def fetch_json(url):
 
         self.assertEqual(MODULE.count_queued_jobs(fetch_json, [repo]), 2)
 
+    def test_count_queued_jobs_excludes_blacksmith_jobs(self):
+        repo = "dashpay/dash"
+        queued_url = (
+            "https://api.github.com/repos/{}/actions/runs?status=queued&per_page=100"
+        ).format(repo)
+        in_progress_url = (
+            "https://api.github.com/repos/{}/actions/runs?status=in_progress&per_page=100"
+        ).format(repo)
+        jobs_url = (
+            "https://api.github.com/repos/{}/actions/runs/101/jobs?per_page=100"
+        ).format(repo)
+
+        responses = {
+            queued_url: ({"workflow_runs": [{"id": 101}]}, {}),
+            in_progress_url: ({"workflow_runs": []}, {}),
+            jobs_url: (
+                {
+                    "jobs": [
+                        {"status": "queued", "labels": ["ubuntu-24.04"]},
+                        {"status": "queued", "labels": ["blacksmith-4vcpu-ubuntu-2404"]},
+                        {"status": "queued", "labels": ["blacksmith-4vcpu-ubuntu-2404-arm"]},
+                        {"status": "queued", "labels": ["self-hosted", "linux"]},
+                    ]
+                },
+                {},
+            ),
+        }
+
+        def fetch_json(url):
+            return responses[url]
+
+        self.assertEqual(MODULE.count_queued_jobs(fetch_json, [repo]), 1)
+
     def test_label_override_selects_blacksmith_even_with_low_backlog(self):
         outputs = MODULE.select_runners(
             event_name="pull_request_target",
@@ -74,7 +107,7 @@ def test_backlog_threshold_selects_blacksmith(self):
         responses = {
             queued_url: ({"workflow_runs": [{"id": 101}]}, {}),
             in_progress_url: ({"workflow_runs": []}, {}),
-            jobs_url: ({"jobs": [{"status": "queued"}] * 11}, {}),
+            jobs_url: ({"jobs": [{"status": "queued", "labels": ["ubuntu-24.04"]}] * 11}, {}),
         }
 
         outputs = MODULE.select_runners(
