From 595858b6c19857cf73a51acc60a51a8ef604f72d Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:06:51 +0000 Subject: [PATCH] Use imagemagick6 as it doesn't depend on Python. (#2557) --- ci_scripts/ci_common.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh index c6e9c6b68f..4526c841fe 100755 --- a/ci_scripts/ci_common.sh +++ b/ci_scripts/ci_common.sh @@ -30,7 +30,11 @@ setup_xcode_cloud_environment () { } install_xcode_cloud_brew_dependencies () { - brew update && brew install xcodegen imagemagick + brew update && brew install xcodegen + + if [ "$CI_WORKFLOW" = "Nightly" ]; then + brew install imagemagick@6 + fi } install_xcode_cloud_python_dependencies () { @@ -44,7 +48,7 @@ setup_github_actions_environment() { brew update && brew install xcodegen swiftformat git-lfs a7ex/homebrew-formulae/xcresultparser if [ "$CI_WORKFLOW" = "PR_BUILD" ]; then - brew install imagemagick + brew install imagemagick@6 fi # brew "swiftlint" # Fails on the CI: `Target /usr/local/bin/swiftlint Target /usr/local/bin/swiftlint already exists`. Installed through https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md#linters