Skip to content

fix system image library uninstallation on macos x86 #7622

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

Merged
merged 9 commits into from
May 24, 2023
Merged

fix system image library uninstallation on macos x86 #7622

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8c5b877
[DEBUG] try revert linpng uninstallation on macos-12
pmeier May 24, 2023
f30e413
[REVERTME] disable unrelated CI
pmeier May 24, 2023
09295b3
Revert "[REVERTME] disable unrelated CI"
pmeier May 24, 2023
79168b4
Merge branch 'main' into macos-build
pmeier May 24, 2023
f033fac
Revert "[DEBUG] try revert linpng uninstallation on macos-12"
pmeier May 24, 2023
334b4e5
fix bash loop
pmeier May 24, 2023
48b25c2
[REVERTME] disable unrelated CI
pmeier May 24, 2023
d7371d4
Revert "[REVERTME] disable unrelated CI"
pmeier May 24, 2023
01c1a95
Merge branch 'main' into macos-build
pmeier May 24, 2023
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
5 changes: 2 additions & 3 deletions .github/scripts/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ if [[ "${OS_TYPE}" == "macos" && $(uname -m) == x86_64 ]]; then
# The x86 macOS runners, e.g. the GitHub Actions native "macos-12" runner, has some JPEG and PNG libraries
# installed by default that interfere with our build. We uninstall them here and use the one from conda below.
IMAGE_LIBS=$(brew list | grep -E "jpeg|png")
echo "${IMAGE_LIBS}"
for lib in "${IMAGE_LIBS}"; do
brew uninstall --ignore-dependencies --force "${lib}" || true
for lib in $IMAGE_LIBS; do
brew uninstall --ignore-dependencies --force "${lib}"
done
echo '::endgroup::'
fi
Expand Down