From 68d0dff890395ca9580d5db927f65e01b8b6b4be Mon Sep 17 00:00:00 2001
From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com>
Date: Tue, 2 Sep 2025 19:54:09 -0500
Subject: [PATCH] [CI] Check for cmake for arm, move s3cmd out of arch specific
 flow

---
 .gitlab-ci.yml                   | 1 +
 CI/macos/before_install.amd64.sh | 2 +-
 CI/macos/before_install.arm64.sh | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f522f1e71..f779c52e44 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/CI/macos/before_install.amd64.sh b/CI/macos/before_install.amd64.sh
index 642f2c2c62..5ed4f23b21 100755
--- a/CI/macos/before_install.amd64.sh
+++ b/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
diff --git a/CI/macos/before_install.arm64.sh b/CI/macos/before_install.arm64.sh
index d53d847b1c..d1fb572f01 100755
--- a/CI/macos/before_install.arm64.sh
+++ b/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