Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix macOS 12 #1722

Merged
merged 2 commits into from
Sep 23, 2024
Merged

Fix macOS 12 #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1986780
ci/macos: update azure task
bindea-cristian Sep 20, 2024
f3ee49f
ci/macOS: on macOS 12 do not upgrade existing packages
bindea-cristian Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ stages:
ls -la
displayName: 'Rename and copy artifact'
workingDirectory: $(Build.Repository.LocalPath)
- task: GithubRelease@0
- task: GithubRelease@1
displayName: 'Push to continuous release'
condition: and(succeeded(), and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
inputs:
Expand Down
11 changes: 9 additions & 2 deletions ci/macOS/install_macos_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,16 @@ install_packages() {
rm /usr/local/bin/python3-config || true

brew update
brew upgrade || true #ignore homebrew upgrade errors
# Workaround for brew taking a long time to upgrade existing packages
# Check if macOS version and upgrade packages only if the version is greater than 12
if (( $(echo "$(sw_vers -productVersion) > 12.0" | bc -1) )); then
brew upgrade --display-times || true #ignore homebrew upgrade errors
brew install --display-times $PACKAGES
else
HOMEBREW_NO_AUTO_UPDATE=1 brew install --display-times $PACKAGES
fi

brew search ${QT_FORMULAE}
brew install --display-times $PACKAGES
for pkg in gcc bison gettext cmake python; do
brew link --overwrite --force $pkg
done
Expand Down
Loading