From 4b46b7a8114ed76e1de1523cd2a830694e5eedfa Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Sat, 30 Aug 2025 16:34:26 +0900
Subject: [PATCH] Only install binaries in static-checks task (#2717)

Also remove outdated version checks.
---
 .github/workflows/ci.yml             | 18 +++++++++---------
 .github/workflows/linux-ci-helper.sh |  9 +--------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7f3f1a..1cf7ee1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -147,17 +147,10 @@ jobs:
           make --jobs=$(sysctl -n hw.ncpu)
 
       - name: Cppcheck
-        run: |
-          # specify the version range to run cppcheck (cppcheck version number is x.y or x.y.z)
-          if cppcheck --version | sed -e 's/\./ /g' | awk '{if (($2 * 1000 + $3) <= 2004) { exit(1) } }'; then
-            make cppcheck
-          fi
+        run: make cppcheck
 
       - name: Shellcheck
-        run: |
-          if shellcheck --version | awk -F '[ .]' '/version:/ && ($2 * 1000 + $3 <= 7) { exit(1) }'; then
-            make shellcheck
-          fi
+        run: make shellcheck
 
       - name: Test suite
         run: |
@@ -272,6 +265,13 @@ jobs:
         run: |
           .github/workflows/linux-ci-helper.sh fedora:42
 
+      - name: Install extra packages
+        run: |
+          dnf install -y \
+            clang-tools-extra \
+            cppcheck \
+            ShellCheck
+
       - name: Build
         run: |
           ./autogen.sh
diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh
index 8d6a05e..d006c4b 100755
--- a/.github/workflows/linux-ci-helper.sh
+++ b/.github/workflows/linux-ci-helper.sh
@@ -208,7 +208,6 @@ elif [ "${CONTAINER_FULLNAME}" = "rockylinux/rockylinux:10" ]; then
     INSTALL_PACKAGES=(
         attr
         automake
-        clang-tools-extra
         curl
         curl-devel
         diffutils
@@ -248,7 +247,6 @@ elif [ "${CONTAINER_FULLNAME}" = "rockylinux:9" ]; then
     INSTALL_PACKAGES=(
         attr
         automake
-        clang-tools-extra
         curl
         curl-devel
         diffutils
@@ -283,7 +281,6 @@ elif [ "${CONTAINER_FULLNAME}" = "rockylinux:8" ]; then
     INSTALL_PACKAGES=(
         attr
         automake
-        clang-tools-extra
         curl
         curl-devel
         diffutils
@@ -317,8 +314,6 @@ elif [ "${CONTAINER_FULLNAME}" = "fedora:42" ] ||
         attr
         automake
         clang
-        clang-tools-extra
-        cppcheck
         curl
         curl-devel
         diffutils
@@ -341,7 +336,6 @@ elif [ "${CONTAINER_FULLNAME}" = "fedora:42" ] ||
         openssl-devel
         perl-Test-Harness
         procps
-        ShellCheck
     )
 
 elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
@@ -352,7 +346,6 @@ elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
     INSTALL_PACKAGES=(
         attr
         automake
-        clang-tools
         curl
         curl-devel
         fuse
@@ -365,6 +358,7 @@ elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
         openssl
         openssl-devel
         procps
+        python3
     )
 
 elif [ "${CONTAINER_FULLNAME}" = "alpine:3.22" ]; then
@@ -377,7 +371,6 @@ elif [ "${CONTAINER_FULLNAME}" = "alpine:3.22" ]; then
         autoconf
         automake
         aws-cli
-        clang-extra-tools
         coreutils
         curl
         curl-dev