swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use imagemagick6 as it doesn't depend on Python. (#2557)

Browse Source
This commit is contained in:
Doug 2024-03-12 17:06:51 +00:00 committed by GitHub
parent 83f5ae9192
commit 595858b6c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci_scripts/ci_common.sh
View File

@ -30,7 +30,11 @@ setup_xcode_cloud_environment () {
} }
install_xcode_cloud_brew_dependencies () { 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 () { 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 brew update && brew install xcodegen swiftformat git-lfs a7ex/homebrew-formulae/xcresultparser
if [ "$CI_WORKFLOW" = "PR_BUILD" ]; then if [ "$CI_WORKFLOW" = "PR_BUILD" ]; then
brew install imagemagick brew install imagemagick@6
fi 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 # 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