From 1f02122211f085bb1e302864e09770cedc230fe1 Mon Sep 17 00:00:00 2001 From: Pasukhin Dmitry Date: Sat, 30 Aug 2025 17:16:23 +0100 Subject: [PATCH] Testing - Fix macOS setup to install Mono separately (#697) - Replaces single brew install command with multiple individual brew install commands - Each package installation is wrapped with `|| true` to prevent failures from stopping the workflow --- .github/actions/configure-occt/action.yml | 2 +- .github/actions/vcpkg-setup/action.yml | 9 ++++++++- .github/workflows/build-and-test-multiplatform.yml | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/actions/configure-occt/action.yml b/.github/actions/configure-occt/action.yml index df2e4746f5..97c63bffe7 100644 --- a/.github/actions/configure-occt/action.yml +++ b/.github/actions/configure-occt/action.yml @@ -126,7 +126,7 @@ runs: -D BUILD_GTEST=ON \ -D BUILD_CPP_STANDARD=C++17 \ -D INSTALL_GTEST=ON \ - -D CMAKE_CXX_FLAGS="-Werror -Wall -Wextra" \ + -D CMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wno-error=cast-function-type-mismatch" \ ${{ inputs.additional-cmake-flags }} .. echo "Configuration completed successfully for macOS" shell: bash diff --git a/.github/actions/vcpkg-setup/action.yml b/.github/actions/vcpkg-setup/action.yml index 4cf57d4d43..8a904b2f19 100644 --- a/.github/actions/vcpkg-setup/action.yml +++ b/.github/actions/vcpkg-setup/action.yml @@ -56,7 +56,14 @@ runs: if: runner.os == 'macOS' run: | brew update || true - brew install cmake ninja nasm autoconf automake mono openexr || true + # Install each package separately to continue even if some fail + brew install cmake || true + brew install ninja || true + brew install nasm || true + brew install autoconf || true + brew install automake || true + brew install mono || true + brew install openexr || true brew install --cask xquartz || true shell: bash diff --git a/.github/workflows/build-and-test-multiplatform.yml b/.github/workflows/build-and-test-multiplatform.yml index 9b9ac7148e..667d255764 100644 --- a/.github/workflows/build-and-test-multiplatform.yml +++ b/.github/workflows/build-and-test-multiplatform.yml @@ -125,7 +125,7 @@ jobs: artifact-name: install-macos-clang-no-pch build-use-pch: 'false' build-opt-profile: 'Default' - additional-cmake-flags: '-D CMAKE_CXX_FLAGS="-Werror -Wall -Wextra" -D CMAKE_C_FLAGS="-Werror -Wall -Wextra"' + additional-cmake-flags: '-D CMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wno-error=cast-function-type-mismatch" -D CMAKE_C_FLAGS="-Werror -Wall -Wextra -Wno-error=cast-function-type-mismatch"' cmake-build-type: 'Debug' github-token: ${{ secrets.GITHUB_TOKEN }} -- 2.39.5