From 6a9b2d330210ccdeb6f98a69ad86a8a0928fb1f4 Mon Sep 17 00:00:00 2001
From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com>
Date: Sun, 6 Jul 2025 17:27:40 -0500
Subject: [PATCH] [CI] Brew cleanup/simplify

---
 .gitlab-ci.yml                   | 6 ++++++
 CI/before_install.macos.sh       | 4 ----
 CI/macos/before_install.arm64.sh | 9 +--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc638729c4..f1c96b1776 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -546,6 +546,9 @@ macOS14_Xcode15_amd64:
     CCACHE_SIZE: 3G
     DMG_IDENTIFIER: amd64
     MACOS_AMD64: true
+    HOMEBREW_NO_AUTO_UPDATE: 1
+    HOMEBREW_NO_EMOJI: true
+    HOMEBREW_NO_INSTALL_CLEANUP: true
 
 macOS14_Xcode15_arm64:
   extends: .MacOS
@@ -557,6 +560,9 @@ macOS14_Xcode15_arm64:
   variables:
     DMG_IDENTIFIER: arm64
     CCACHE_SIZE: 3G
+    HOMEBREW_NO_AUTO_UPDATE: 1
+    HOMEBREW_NO_EMOJI: true
+    HOMEBREW_NO_INSTALL_CLEANUP: true
 
 .Compress_And_Upload_Symbols_Base:
   extends: .Ubuntu_Image
diff --git a/CI/before_install.macos.sh b/CI/before_install.macos.sh
index f466dd06a7..60d2d3a38c 100755
--- a/CI/before_install.macos.sh
+++ b/CI/before_install.macos.sh
@@ -1,9 +1,5 @@
 #!/bin/sh -ex
 
-export HOMEBREW_NO_EMOJI=1
-export HOMEBREW_NO_INSTALL_CLEANUP=1
-export HOMEBREW_AUTOREMOVE=1
-
 if [[ "${MACOS_AMD64}" ]]; then
     ./CI/macos/before_install.amd64.sh
 else
diff --git a/CI/macos/before_install.arm64.sh b/CI/macos/before_install.arm64.sh
index 84120dfba2..d53d847b1c 100755
--- a/CI/macos/before_install.arm64.sh
+++ b/CI/macos/before_install.arm64.sh
@@ -3,14 +3,7 @@
 brew tap --repair
 brew update --quiet
 
-brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd
-
-command -v ccache >/dev/null 2>&1 || brew install ccache
-command -v cmake >/dev/null 2>&1 || brew install cmake
-command -v qmake >/dev/null 2>&1 || brew install qt@6
-
-# Install deps
-brew install openal-soft icu4c yaml-cpp sqlite
+brew install curl xquartz gd fontconfig freetype harfbuzz brotli s3cmd 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-20240818-arm64.tar.xz -o ~/openmw-deps.tar.xz
 tar xf ~/openmw-deps.tar.xz -C /tmp > /dev/null