From 85e01c40046684d9464637addd62f144b2959ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@des.dev>
Date: Wed, 1 May 2024 11:55:02 +0200
Subject: [PATCH] github-ci: Drop requirement for GNU find.

---
 .ci.sh                                     | 3 +--
 .github/workflows/cppcheck.yml             | 2 +-
 .github/workflows/scripts/mass-cppcheck.sh | 8 +-------
 Brewfile                                   | 1 -
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.ci.sh b/.ci.sh
index 374bc025..3913c997 100755
--- a/.ci.sh
+++ b/.ci.sh
@@ -38,7 +38,6 @@ if [[ ${RUNNER_OS} = macOS ]]; then
     latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"
     export PATH="${latest_brew_python3_bin}${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
-    export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
 elif [[ ${RUNNER_OS} = Linux ]]; then
     export PATH="/usr/lib/llvm-18/bin:${PATH}"
 else
@@ -65,7 +64,7 @@ elif [[ ${MODE} = cmake-oos ]]; then
     cmake ${CMAKE_ARGS} ..
     make VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=1 all test
     make DESTDIR="${PWD}"/ROOT install
-    find ROOT -printf "%P\n" | sort
+    find ROOT | cut -c 6- | sort
 elif [[ ${MODE} = coverage-sh ]]; then
     ./coverage.sh
 else
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 0c9558a5..e6f43891 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -48,7 +48,7 @@ jobs:
     - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
     - name: Install runtime dependencies
       run: |
-        exec brew install cppcheck findutils
+        exec brew install cppcheck
     - name: Run Cppcheck
       run: |
         exec .github/workflows/scripts/mass-cppcheck.sh
diff --git a/.github/workflows/scripts/mass-cppcheck.sh b/.github/workflows/scripts/mass-cppcheck.sh
index 0eaa407e..fb3ef6b8 100755
--- a/.github/workflows/scripts/mass-cppcheck.sh
+++ b/.github/workflows/scripts/mass-cppcheck.sh
@@ -31,14 +31,8 @@
 PS4='# '
 set -e -u -o pipefail -x
 
-if [[ "$(uname -s)" =~ ^Darwin ]]; then
-    export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
-fi
-
 cppcheck --version
 
-find --version | head -n1
-
 for xml_context_bytes in 0 1024; do
     for xml_ge in 0 1; do
         cppcheck_args=(
@@ -63,6 +57,6 @@ for xml_context_bytes in 0 1024; do
             -exec cppcheck "${cppcheck_args[@]}" {} +
         )
 
-        time find "${find_args[@]}"
+        time find . "${find_args[@]}"
     done
 done
diff --git a/Brewfile b/Brewfile
index 740aab51..118b2bdb 100644
--- a/Brewfile
+++ b/Brewfile
@@ -4,7 +4,6 @@ brew "cmake"
 brew "coreutils"
 brew "docbook2x"
 brew "dos2unix"
-brew "findutils"
 brew "gcc"
 brew "gettext"
 brew "ghostscript"