From 7c34e089e491465784ab3a468284806782291d01 Mon Sep 17 00:00:00 2001 From: ExPikaPaka Date: Thu, 4 Jun 2026 14:37:03 +0200 Subject: [PATCH] Try to fix mac build again Ahh, I never compiled any program on Mac, i thought it will behave the same was as Linux, but there are some diferences of course.. --- .github/workflows/build_orca.yml | 8 +++++--- build_release_macos.sh | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index fa469500e5..a5aff3f07b 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -60,11 +60,13 @@ jobs: - name: Install codegen tools and generate config sources run: | if [ "$(uname)" = "Linux" ]; then - pip3 install grpcio-tools + pip3 install grpcio-tools pyyaml + python3 tools/run_codegen.py else - brew install protobuf + python3 -m venv /tmp/codegen_venv + /tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q + /tmp/codegen_venv/bin/python tools/run_codegen.py fi - python3 tools/run_codegen.py if: runner.os != 'Windows' shell: bash diff --git a/build_release_macos.sh b/build_release_macos.sh index 2514bc5f66..e599f2246e 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -181,7 +181,10 @@ function pack_deps() { function build_slicer() { echo "Generating config sources from proto..." - python3 tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; } + python3 -m venv /tmp/codegen_venv + /tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q + /tmp/codegen_venv/bin/python tools/run_codegen.py || { echo "ERROR: config codegen failed"; exit 1; } + CODEGEN_PYTHON="/tmp/codegen_venv/bin/python3" # iterate over two architectures: x86_64 and arm64 for _ARCH in x86_64 arm64; do @@ -207,6 +210,7 @@ function build_slicer() { -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \ -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \ -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \ + -DPython3_EXECUTABLE="${CODEGEN_PYTHON}" \ ${CMAKE_POLICY_COMPAT} fi cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"