From b7e1c505b4fa62a905c9144e0c7a11afcf94edc6 Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Wed, 13 Mar 2024 14:18:06 -0700 Subject: [PATCH 1/2] Remove python3 /usr/local/bin links on brew update Signed-off-by: Dan Bailey --- .github/workflows/houdini.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 84b0ca4f35..53dedceb36 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -160,6 +160,11 @@ jobs: cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd - - name: install_deps run: | + # Remove Python3 symlinks in /usr/local/bin as workaround to brew update issues + rm /usr/local/bin/2to3* || : + rm /usr/local/bin/idle3* || : + rm /usr/local/bin/pydoc* || : + rm /usr/local/bin/python3* || : brew update brew install bash gnu-getopt cmake boost glfw googletest openexr pybind11 llvm@15 cppunit echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH From c910412ac29918f3d047591d1db15c3f1c41fdba Mon Sep 17 00:00:00 2001 From: Dan Bailey Date: Wed, 13 Mar 2024 15:57:54 -0700 Subject: [PATCH 2/2] Add workaround to install_macos script Signed-off-by: Dan Bailey --- .github/workflows/houdini.yml | 1 + ci/install_macos.sh | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml index 53dedceb36..8252cf5473 100644 --- a/.github/workflows/houdini.yml +++ b/.github/workflows/houdini.yml @@ -161,6 +161,7 @@ jobs: - name: install_deps run: | # Remove Python3 symlinks in /usr/local/bin as workaround to brew update issues + # https://github.com/actions/setup-python/issues/577 rm /usr/local/bin/2to3* || : rm /usr/local/bin/idle3* || : rm /usr/local/bin/pydoc* || : diff --git a/ci/install_macos.sh b/ci/install_macos.sh index d87920db00..39d89ba191 100755 --- a/ci/install_macos.sh +++ b/ci/install_macos.sh @@ -2,6 +2,13 @@ set -x +# Remove Python3 symlinks in /usr/local/bin as workaround to brew update issues +# https://github.com/actions/setup-python/issues/577 +rm /usr/local/bin/2to3* || : +rm /usr/local/bin/idle3* || : +rm /usr/local/bin/pydoc* || : +rm /usr/local/bin/python3* || : + brew update brew install bash gnu-getopt # for CI scripts brew install boost