From d5d15b7a9a93654b8f6dc731ef4fb8b9fdb2254f Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia Date: Mon, 21 Dec 2020 14:35:22 -0500 Subject: [PATCH] macos build: Fix ninja install - 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 --- ci/mac_ci_setup.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/mac_ci_setup.sh b/ci/mac_ci_setup.sh index ef29e6c92587..88f8c406dd65 100755 --- a/ci/mac_ci_setup.sh +++ b/ci/mac_ci_setup.sh @@ -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