Merge pull request #868 from dag-erling/des/update-ci

Fix various CI issues

9 files changed, 10 insertions, 22 deletions

diff --git a/.ci.sh b/.ci.sh
index 374bc025..e855be9c 100755
--- a/.ci.sh
+++ b/.ci.sh
@@ -37,8 +37,6 @@ set -e
 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 +63,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/autotools-cmake.yml b/.github/workflows/autotools-cmake.yml
index 0d371f11..bf48db9b 100644
--- a/.github/workflows/autotools-cmake.yml
+++ b/.github/workflows/autotools-cmake.yml
@@ -46,7 +46,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-11
+          - os: macos-14
             configure_args:
             cmake_args:
           - os: ubuntu-20.04
diff --git a/.github/workflows/cmake-required-version.yml b/.github/workflows/cmake-required-version.yml
index 030e363b..de41fe8c 100644
--- a/.github/workflows/cmake-required-version.yml
+++ b/.github/workflows/cmake-required-version.yml
@@ -58,7 +58,7 @@ jobs:
         wget --no-verbose "${download_url}"
 
         chmod +x "${installer_filename}"
-        mkdir ~/.local/
+        mkdir -p ~/.local/
 
         ./"${installer_filename}" --prefix="${HOME}"/.local/ --skip-license
 
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index b9450512..a8e0b9e6 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -59,6 +59,7 @@ jobs:
 
         sudo apt-get install --yes --no-install-recommends -V \
             cmake \
+            docbook-xml \
             docbook2x \
             dos2unix \
             gcc-multilib \
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 0c9558a5..c7ec305d 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -43,12 +43,12 @@ permissions:
 jobs:
   checks:
     name: Run Cppcheck
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
     - 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/linux.yml b/.github/workflows/linux.yml
index 66fcc0c3..22bcb702 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -47,8 +47,6 @@ jobs:
     strategy:
       matrix:
         include:
-          # NOTE: This is a quick port from .travis.yml in reaction to
-          #       stability issues at Travis CI.
           - MODE: cmake-oos
           - MODE: distcheck
           - MODE: qa-sh
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 1c7f3499..f942a8ec 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -45,15 +45,13 @@ jobs:
     name: Perform checks
     strategy:
       matrix:
+        os: [macos-12, macos-14]
         include:
-          # NOTE: This is a quick port from .travis.yml in reaction to
-          #       Homebrew issues at Travis CI.  While we have the matrix
-          #       in two places, please keep the two files in sync.  Thank you!
           - MODE: cmake-oos
           - MODE: distcheck
           - MODE: qa-sh
             FLAT_ENV: CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=address
-    runs-on: macos-11
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
     - name: Install build dependencies
diff --git a/.github/workflows/scripts/mass-cppcheck.sh b/.github/workflows/scripts/mass-cppcheck.sh
index 0eaa407e..8a081a8b 100755
--- a/.github/workflows/scripts/mass-cppcheck.sh
+++ b/.github/workflows/scripts/mass-cppcheck.sh
@@ -31,20 +31,15 @@
 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=(
             --quiet
             --error-exitcode=1
             --force
+            --check-level=exhaustive
             --suppress=objectIndex
             --suppress=unknownMacro
             -DXML_CONTEXT_BYTES=${xml_context_bytes}
@@ -63,6 +58,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..f4bf3b39 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,10 +1,8 @@
 brew "autoconf"
 brew "automake"
 brew "cmake"
-brew "coreutils"
 brew "docbook2x"
 brew "dos2unix"
-brew "findutils"
 brew "gcc"
 brew "gettext"
 brew "ghostscript"