From b059618e60b6fa886171d51d3244e0ce360b4134 Mon Sep 17 00:00:00 2001
From: Matt Staveley-Taylor <matt.stav.taylor@gmail.com>
Date: Fri, 25 Oct 2024 03:11:18 +0200
Subject: [PATCH] ci: consolidate misc workflows

---
 .github/workflows/detect-bad-ifs.yml          | 17 ----------
 .../workflows/detect-missing-mlibc-config.yml | 10 ------
 .github/workflows/fixups.yml                  | 23 -------------
 .github/workflows/misc.yml                    | 33 +++++++++++++++++++
 4 files changed, 33 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/detect-bad-ifs.yml
 delete mode 100644 .github/workflows/detect-missing-mlibc-config.yml
 delete mode 100644 .github/workflows/fixups.yml
 create mode 100644 .github/workflows/misc.yml

diff --git a/.github/workflows/detect-bad-ifs.yml b/.github/workflows/detect-bad-ifs.yml
deleted file mode 100644
index 308088451..000000000
--- a/.github/workflows/detect-bad-ifs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Detect ifdef/defined (mis)use
-
-on: [push, pull_request, merge_group]
-
-jobs:
-  find-misuse:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - run: |
-        printf '(^#ifn?def[[:space:]]+|defined[[:space:]]*[(][[:space:]]*)((%s)([^_A-Za-z0-9]|$))\0' \
-                  "$(printf '%s' "$(awk '/#mesondefine/ { print $2 }' mlibc-config.h.in)" | tr '\n' '|')" \
-                | { ! xargs -0I '{}' grep --color=always -PR '{}' \
-                || { echo 'found misuse'; exit 1; }; }
-
-
-# vim: set sw=2 :
diff --git a/.github/workflows/detect-missing-mlibc-config.yml b/.github/workflows/detect-missing-mlibc-config.yml
deleted file mode 100644
index 359fa77f2..000000000
--- a/.github/workflows/detect-missing-mlibc-config.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Detect missing mlibc-config.h
-
-on: [push, pull_request, merge_group]
-
-jobs:
-  find-misuse:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - run: chmod +x ./scripts/check-options-header-include.sh && ./scripts/check-options-header-include.sh
diff --git a/.github/workflows/fixups.yml b/.github/workflows/fixups.yml
deleted file mode 100644
index 91554f5da..000000000
--- a/.github/workflows/fixups.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Check if PR has fixups
-
-on: [pull_request, merge_group]
-
-jobs:
-  find-fixups:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - run: |
-          set -e -o pipefail
-
-          git rev-list 'HEAD^..HEAD' \
-            | while read -r COMMIT; do
-            printf 'pondering commit %s\n' "$COMMIT"
-            git show -s "$COMMIT"
-            if git show -s --format='%s' "$COMMIT" | grep -q '^fixup! '; then
-              exit 1
-            fi
-          done
-          printf 'ready to merge!\n'
diff --git a/.github/workflows/misc.yml b/.github/workflows/misc.yml
new file mode 100644
index 000000000..2b6dda017
--- /dev/null
+++ b/.github/workflows/misc.yml
@@ -0,0 +1,33 @@
+name: Miscellaneous checks
+
+on: [pull_request, merge_group]
+
+jobs:
+  find-fixups:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: 'Check for fixup commits'
+        run: |
+          set -e -o pipefail
+
+          git rev-list 'HEAD^..HEAD' \
+            | while read -r COMMIT; do
+            printf 'pondering commit %s\n' "$COMMIT"
+            git show -s "$COMMIT"
+            if git show -s --format='%s' "$COMMIT" | grep -q '^fixup! '; then
+              exit 1
+            fi
+          done
+
+      - name: 'Detect missing mlibc-config.h'
+        run: chmod +x ./scripts/check-options-header-include.sh && ./scripts/check-options-header-include.sh
+
+      - name: 'Detect ifdef/defined misuse'
+        run: |
+          printf '(^#ifn?def[[:space:]]+|defined[[:space:]]*[(][[:space:]]*)((%s)([^_A-Za-z0-9]|$))\0' \
+                    "$(printf '%s' "$(awk '/#mesondefine/ { print $2 }' mlibc-config.h.in)" | tr '\n' '|')" \
+                  | { ! xargs -0I '{}' grep --color=always -PR '{}' \
+                  || { echo 'found misuse'; exit 1; }; }
+