Merge branch 'macos-ci-fixes' into 'master'

MacOS CI fixes and cleanup

See merge request OpenMW/openmw!4913

.gitlab-ci.yml

@@ -563,6 +563,7 @@ Ubuntu_GCC_integration_tests_asan:
     - CI/macos/build.sh
     - cd build
     - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${DMG_IDENTIFIER}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
+    - brew install s3cmd
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
         echo "[default]" > ~/.s3cfg
@@ -577,7 +578,7 @@ Ubuntu_GCC_integration_tests_asan:
           s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
         done
       fi
-    - ../CI/macos/ccache_save.sh
+    - ../CI/macos/ccache_show_stats.sh
   artifacts:
     paths:
       - build/OpenMW-*.dmg

CI/before_script.macos.sh

@@ -13,18 +13,16 @@ if [[ "${MACOS_AMD64}" ]]; then
     QT_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix qt@6)
     ICU_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix icu4c)
     OPENAL_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix openal-soft)
-    CCACHE_EXECUTABLE=$(arch -x86_64 /usr/local/bin/brew --prefix ccache)/bin/ccache
 else
     QT_PATH=$(brew --prefix qt@6)
     ICU_PATH=$(brew --prefix icu4c)
     OPENAL_PATH=$(brew --prefix openal-soft)
-    CCACHE_EXECUTABLE=$(brew --prefix ccache)/bin/ccache
 fi
 
 declare -a CMAKE_CONF_OPTS=(
 -D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH;$OPENAL_PATH"
--D CMAKE_C_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
--D CMAKE_CXX_COMPILER_LAUNCHER="$CCACHE_EXECUTABLE"
+-D CMAKE_C_COMPILER_LAUNCHER="ccache"
+-D CMAKE_CXX_COMPILER_LAUNCHER="ccache"
 -D CMAKE_CXX_FLAGS="-stdlib=libc++"
 -D CMAKE_C_COMPILER="clang"
 -D CMAKE_CXX_COMPILER="clang++"

CI/macos/before_install.amd64.sh

@@ -2,7 +2,7 @@
 
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
-arch -x86_64 /usr/local/bin/brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
+arch -x86_64 /usr/local/bin/brew install curl xquartz gd fontconfig freetype harfbuzz brotli ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
 
 curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802.zip -o ~/openmw-deps.zip
 unzip -o ~/openmw-deps.zip -d /tmp > /dev/null

CI/macos/before_install.arm64.sh

@@ -3,7 +3,9 @@
 brew tap --repair
 brew update --quiet
 
-brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd ccache cmake qt@6 openal-soft icu4c yaml-cpp sqlite
+command -v cmake >/dev/null 2>&1 || brew install cmake
+
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli qt@6 ccache openal-soft icu4c yaml-cpp sqlite
 
 curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240818-arm64.tar.xz -o ~/openmw-deps.tar.xz
 tar xf ~/openmw-deps.tar.xz -C /tmp > /dev/null