From adc4698c4460763eccb8e0c42f10bea2c74610a0 Mon Sep 17 00:00:00 2001
From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com>
Date: Sat, 21 Jun 2025 21:14:44 -0500
Subject: [PATCH] [CI] Revert ccache script forking, rename try, cleanup

---
 .gitlab-ci.yml                   | 4 ++--
 CI/macos/before_install.arm64.sh | 4 ----
 CI/macos/ccache_prep.sh          | 7 +------
 CI/macos/ccache_save.sh          | 7 -------
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100755 CI/macos/ccache_save.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab8aa3d76d..30654a8471 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/CI/macos/before_install.arm64.sh b/CI/macos/before_install.arm64.sh
index 1be5f7b740..84120dfba2 100755
--- a/CI/macos/before_install.arm64.sh
+++ b/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
diff --git a/CI/macos/ccache_prep.sh b/CI/macos/ccache_prep.sh
index 17af2f9b55..06dd5c8479 100755
--- a/CI/macos/ccache_prep.sh
+++ b/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}"
diff --git a/CI/macos/ccache_save.sh b/CI/macos/ccache_save.sh
deleted file mode 100755
index d06d16fb0c..0000000000
--- a/CI/macos/ccache_save.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -ex
-
-if [[ "${MACOS_AMD64}" ]]; then
-    arch -x86_64 ccache -s
-else
-    ccache -s
-fi