From: Viktor Szakats <commit@vsz.me>
Date: Sat, 12 Jul 2025 16:07:51 +0000 (+0200)
Subject: GHA/checksrc: use Linux for CI checks, merge job into misc checks
X-Git-Tag: curl-8_15_0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7331208ec54250b26c9297592398e04f8b22b09e;p=thirdparty%2Fcurl.git

GHA/checksrc: use Linux for CI checks, merge job into misc checks

CI check used macOS before this patch, but with the help of Linuxbrew,
latest zizmor and shellcheck are also available on Linux.

Also:
- migrate CI checks to the misc check workflow, to make both shellcheck
  use the same, latest, shellcheck version, and to save the overhead of
  an extra workflow.

Closes #17911
---

diff --git a/.github/workflows/checksrc.yml b/.github/workflows/checksrc.yml
index f7835499eb..87087fe8e7 100644
--- a/.github/workflows/checksrc.yml
+++ b/.github/workflows/checksrc.yml
@@ -121,12 +121,27 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
+      - name: 'install prereqs'
+        run: /home/linuxbrew/.linuxbrew/bin/brew install shellcheck zizmor
+
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
 
+      - name: 'zizmor GHA'
+        run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+          zizmor --pedantic .github/workflows/*.yml
+
+      - name: 'shellcheck GHA'
+        run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+          shellcheck --version
+          .github/scripts/shellcheck-ci.sh
+
       - name: 'shellcheck'
         run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
           shellcheck --version
           .github/scripts/shellcheck.sh
 
@@ -142,23 +157,3 @@ jobs:
           # shellcheck disable=SC2046
           grep -Ev '(\\bwill| url | dir )' .github/scripts/badwords.txt | \
           .github/scripts/badwords.pl $(git ls-files -- src lib include)
-
-  cicheck:
-    name: 'CI'
-    runs-on: macos-latest
-    timeout-minutes: 1
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          persist-credentials: false
-
-      - name: 'install prereqs'
-        run: brew install shellcheck zizmor
-
-      - name: 'zizmor GHA'
-        run: zizmor --pedantic .github/workflows/*.yml
-
-      - name: 'shellcheck GHA'
-        run: |
-          shellcheck --version
-          .github/scripts/shellcheck-ci.sh