diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44cc1b9..be4c0b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Build project run: | - ( cd usr/local/bin/brew/Library/Taps/openrtm/homebrew-omniorb ; bash build.sh ) + ( cd /usr/local/bin/brew/Library/Taps/openrtm/homebrew-omniorb ; bash build.sh ) build-apple-silicon: name: omniORB Formula build on macOS (ARM64) diff --git a/build.sh b/build.sh index ae4e999..1f968ce 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/bin/bash build=( -# "omniorb-ssl-py39 python@3.9" -# "omniorb-ssl-py310 python@3.10" + "omniorb-ssl-py39 python@3.9" + "omniorb-ssl-py310 python@3.10" "omniorb-ssl-py311 python@3.11" "omniorb-ssl-py312 python@3.12" "omniorb-ssl-py313 python@3.13" @@ -40,6 +40,11 @@ cleanup() { for ((i=0; ${#build[*]}>$i; i++)) ; do tmp=(${build[$i]}) + installed=`brew info ${tmp[0]} | grep Installed` + if test "x" = "x$installed" ; then + echo "Not installed: ${tmp[0]}. Do nothing." + continue + fi echo "Cleanup: ${tmp[0]}" brew unlink "${tmp[0]}" brew remove --ignore-dependencies "${tmp[0]}"