Skip to content

Commit

Permalink
macos build: Fix ninja install
Browse files Browse the repository at this point in the history
- python@3.9 (dependency of ninja) 2to3 tool conflicting with system python
- remove 2to3 if exists
- remove now unneeded openssl workaround

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
  • Loading branch information
sunjayBhatia committed Dec 21, 2020
1 parent d7cc4aa commit d5d15b7
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ci/mac_ci_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
# https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md for
# a list of pre-installed tools in the macOS image.

# https://github.com/actions/virtual-environments/issues/1811
brew uninstall openssl@1.0.2t
# https://github.com/actions/virtual-environments/issues/2322
if command -v 2to3 > /dev/null; then
rm -f "$(command -v 2to3)"
fi

export HOMEBREW_NO_AUTO_UPDATE=1
HOMEBREW_RETRY_ATTEMPTS=10
Expand Down

0 comments on commit d5d15b7

Please sign in to comment.