CI - Use XZ for Mac builds, clean some steps

.github/workflows/openmw.yml

@@ -83,9 +83,7 @@ jobs:
         max-size: 1000M
 
     - name: Configure
-      run: |
+      run: CI/before_script.osx.sh
-        rm -fr build  # remove the build directory
-        CI/before_script.osx.sh
     - name: Build
       run: |
         cd build

.gitlab-ci.yml

@@ -501,7 +501,6 @@ Ubuntu_GCC_integration_tests_asan:
     paths:
     - ccache/
   script:
-    - rm -fr build  # remove the build directory
     - CI/before_install.osx.sh
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
@@ -521,7 +520,6 @@ Ubuntu_GCC_integration_tests_asan:
   artifacts:
     paths:
       - build/OpenMW-*.dmg
-      - "build/**/*.log"
 
 macOS14_Xcode15_arm64:
   extends: .MacOS

CI/before_install.osx.sh

@@ -4,14 +4,9 @@ export HOMEBREW_NO_EMOJI=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_AUTOREMOVE=1
 
-# workaround for gitlab's pre-installed brew
-# purge large and unnecessary packages that get in our way and have caused issues
-brew uninstall ruby php openjdk node postgresql maven curl || true
-
 brew tap --repair
 brew update --quiet
 
-# Some of these tools can come from places other than brew, so check before installing
 brew install curl xquartz gd fontconfig freetype harfbuzz brotli
 
 command -v ccache >/dev/null 2>&1 || brew install ccache
@@ -27,8 +22,9 @@ cmake --version
 qmake --version
 
 if [[ "${MACOS_AMD64}" ]]; then
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20221113.zip -o ~/openmw-deps.zip
+    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
 else
-    curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20240802_arm64.zip -o ~/openmw-deps.zip
+    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
 fi
-unzip -o ~/openmw-deps.zip -d /tmp > /dev/null

CI/before_script.osx.sh

@@ -3,6 +3,7 @@
 # Silence a git warning
 git config --global advice.detachedHead false
 
+rm -fr build
 mkdir build
 cd build