From 12f359622057ba735cc45bd615dea579768d4f18 Mon Sep 17 00:00:00 2001 From: Sarah Sunday <1644563-ssunday@users.noreply.gitlab.com> Date: Sat, 21 Jun 2025 14:19:43 -0500 Subject: [PATCH] [CI] Specify intel brew location --- CI/before_script.osx.sh | 8 ++++---- CI/macos/before_install.x86_64.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index ceabaef280..9281089c43 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -10,10 +10,10 @@ cd build DEPENDENCIES_ROOT="/tmp/openmw-deps" if [[ "${MACOS_X86_64}" ]]; then - QT_PATH=$(arch -x86_64 brew --prefix qt@6) - ICU_PATH=$(arch -x86_64 brew --prefix icu4c) - OPENAL_PATH=$(arch -x86_64 brew --prefix openal-soft) - CCACHE_EXECUTABLE=$(arch -x86_64 brew --prefix ccache)/bin/ccache + QT_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix qt@6) + ICU_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix icu4c) + OPENAL_PATH=$(arch -x86_64 /usr/local/bin/brew --prefix openal-soft) + CCACHE_EXECUTABLE=$(arch -x86_64 /usr/local/bin/brew --prefix ccache)/bin/ccache else QT_PATH=$(brew --prefix qt@6) ICU_PATH=$(brew --prefix icu4c) diff --git a/CI/macos/before_install.x86_64.sh b/CI/macos/before_install.x86_64.sh index 6e5664c3b0..642f2c2c62 100755 --- a/CI/macos/before_install.x86_64.sh +++ b/CI/macos/before_install.x86_64.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 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 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-20240802.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /tmp > /dev/null