From ff60b741a7651748be33ac91fbf750504812a7df Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Sat, 6 Sep 2025 00:51:52 +0100 Subject: [PATCH] Move architecture-independent tool installation to common script --- CI/before_install.macos.sh | 3 +++ CI/macos/before_install.amd64.sh | 2 -- CI/macos/before_install.arm64.sh | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CI/before_install.macos.sh b/CI/before_install.macos.sh index 60d2d3a38c..4d095cdb74 100755 --- a/CI/before_install.macos.sh +++ b/CI/before_install.macos.sh @@ -5,3 +5,6 @@ if [[ "${MACOS_AMD64}" ]]; then else ./CI/macos/before_install.arm64.sh fi + +command -v ccache >/dev/null 2>&1 || brew install ccache +command -v cmake >/dev/null 2>&1 || brew install cmake diff --git a/CI/macos/before_install.amd64.sh b/CI/macos/before_install.amd64.sh index 5385338c0b..16b2724fa7 100755 --- a/CI/macos/before_install.amd64.sh +++ b/CI/macos/before_install.amd64.sh @@ -2,8 +2,6 @@ command -v /usr/local/bin/brew || arch -x86_64 bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" -command -v ccache >/dev/null 2>&1 || brew install ccache -command -v cmake >/dev/null 2>&1 || brew install cmake arch -x86_64 bash -c "command -v qmake >/dev/null 2>&1 && qmake -v | grep -F 'Using Qt version 6.' >/dev/null || /usr/local/bin/brew install qt@6" arch -x86_64 /usr/local/bin/brew install curl xquartz gd fontconfig freetype harfbuzz brotli openal-soft icu4c yaml-cpp sqlite diff --git a/CI/macos/before_install.arm64.sh b/CI/macos/before_install.arm64.sh index 6939fb3a2d..a33bc3296a 100755 --- a/CI/macos/before_install.arm64.sh +++ b/CI/macos/before_install.arm64.sh @@ -3,8 +3,6 @@ brew tap --repair brew update --quiet -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 && qmake -v | grep -F "Using Qt version 6." >/dev/null || brew install qt@6 brew install curl xquartz gd fontconfig freetype harfbuzz brotli openal-soft icu4c yaml-cpp sqlite