Merge branch 'mac-brew-tweaks' into 'master'

[CI] Mac - Brew cleanup/simplify

See merge request OpenMW/openmw!4759
This commit is contained in:
psi29a 2025-07-16 08:44:31 +00:00
commit ab8e17196f
3 changed files with 7 additions and 12 deletions

View File

@ -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

View File

@ -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

View File

@ -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