[CI] Revert ccache script forking, rename try, cleanup

.gitlab-ci.yml

@@ -511,7 +511,7 @@ Ubuntu_GCC_integration_tests_asan:
     - CI/macos/ccache_prep.sh
     - CI/before_script.macos.sh
     - CI/macos/build.sh
-    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME##*/}_${DMG_IDENTIFIER}.dmg"; done
+    - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${DMG_IDENTIFIER}_${CI_COMMIT_REF_NAME##*/}.dmg"; done
     - |
       if [[ -n "${AWS_ACCESS_KEY_ID}" ]]; then
         echo "[default]" > ~/.s3cfg
@@ -526,7 +526,7 @@ Ubuntu_GCC_integration_tests_asan:
           s3cmd put "${dmg}" s3://openmw-artifacts/${artifactDirectory}
         done
       fi
-    - CI/macos/ccache_save.sh
+    - ccache -s
   artifacts:
     paths:
       - build/OpenMW-*.dmg

CI/macos/before_install.arm64.sh

@@ -12,9 +12,5 @@ command -v qmake >/dev/null 2>&1 || brew install qt@6
 # Install deps
 brew install openal-soft icu4c yaml-cpp sqlite
 
-ccache --version
-cmake --version
-qmake --version
-
 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

CI/macos/ccache_prep.sh

@@ -3,10 +3,5 @@
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="$(pwd)/ccache"
 mkdir -pv "${CCACHE_DIR}"
-ccache -z -M "${CCACHE_SIZE}"
 
-if [[ "${MACOS_AMD64}" ]]; then
-    arch -x86_64 ccache -z -M "${CCACHE_SIZE}"
-else
-    ccache -z -M "${CCACHE_SIZE}"
-fi
+ccache -z -M "${CCACHE_SIZE}"

CI/macos/ccache_save.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -ex
-
-if [[ "${MACOS_AMD64}" ]]; then
-    arch -x86_64 ccache -s
-else
-    ccache -s
-fi