Merge remote-tracking branch 'upstream/ci-test' into nogeo

cipig · Oct 11, 2023 · 87e580f · 87e580f
2 parents 9eb0254 + 5a5aa71
commit 87e580f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ci_tools_atomic_dex/ci_scripts/osx_script.sh b/ci_tools_atomic_dex/ci_scripts/osx_script.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-brew update
-
-brew unlink libtool
-wget https://raw.githubusercontent.com/Homebrew/homebrew-core/0fbd6e24c4122e18ade1ec6c5916cb21de14f352/Formula/libtool.rb
-brew install libtool.rb
+# Workaround for https://github.com/actions/setup-python/issues/577
+rm /usr/local/bin/2to3 || true
+rm /usr/local/bin/idle3 || true
+rm /usr/local/bin/pydoc3 || true
+rm /usr/local/bin/python3 || true
+rm /usr/local/bin/python3-config || true
 
+brew update
 brew install autoconf \
             automake \
             pkgconfig \
@@ -14,6 +16,7 @@ brew install autoconf \
             ninja \
             gnu-sed \
             coreutils \
+            libtool \
             llvm \
             gnu-getopt