From 781ae69cc093556b58c49278c92878f3b0e586ee Mon Sep 17 00:00:00 2001 From: Antoine Lambert Date: Fri, 18 Oct 2024 21:48:26 +0200 Subject: [PATCH] gha/macos-homebrew: Fix builds --- .github/workflows/macos-homebrew-build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos-homebrew-build.yml b/.github/workflows/macos-homebrew-build.yml index 5c34a52aa9..993acaeb54 100644 --- a/.github/workflows/macos-homebrew-build.yml +++ b/.github/workflows/macos-homebrew-build.yml @@ -8,8 +8,8 @@ jobs: fail-fast: false matrix: config: - - name: Talipot build on macOS 12 (x86_64) - os: macos-12 + - name: Talipot build on macOS 13 (x86_64) + os: macos-13 pyver: "3.12" homebrew_path: /usr/local - name: Talipot build on macOS 14 (arm64) @@ -41,7 +41,7 @@ jobs: fribidi fontconfig qt6 - quazip || brew link --overwrite python@${{ matrix.config.pyver }} + quazip - name: Install SIP run: pip${{ matrix.config.pyver }} install sip --break-system-packages - name: Prepare ccache timestamp @@ -66,9 +66,11 @@ jobs: -DCMAKE_C_COMPILER=${{ matrix.config.homebrew_path }}/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=${{ matrix.config.homebrew_path }}/opt/llvm/bin/clang++ -DCMAKE_SHARED_LINKER_FLAGS="-L${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++ - -Wl,-rpath,${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++" + -Wl,-rpath,${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++ + -L${{ matrix.config.homebrew_path }}/opt/llvm/lib/unwind -lunwind" -DCMAKE_EXE_LINKER_FLAGS="-L${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++ - -Wl,-rpath,${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++" + -Wl,-rpath,${{ matrix.config.homebrew_path }}/opt/llvm/lib/c++ + -L${{ matrix.config.homebrew_path }}/opt/llvm/lib/unwind -lunwind" -DCMAKE_RANLIB=/usr/bin/ranlib -DPython3_EXECUTABLE=${{ matrix.config.homebrew_path }}/bin/python${{ matrix.config.pyver }} -DTALIPOT_BUILD_CORE_ONLY=ON