diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 9bb91a6b77..0cab49175d 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -17,33 +17,15 @@ jobs: - name: Kill XProtectBehaviorService run: | echo Killing XProtect.; sudo pkill -9 XProtect >/dev/null || true; + + - name: Install latest Python3 via brew + run: brew install python3 || brew link --overwrite python@3.12 - - name: Downgrade Python version - uses: actions/setup-python@v4 - id: cp39 - with: - python-version: '3.9' - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - setup-python: false - version: '5.15.2' - target: 'desktop' + - name: Install latest Qt5 via brew + run: brew install qt@5 - name: Install Dependencies - run: brew install ninja doxygen graphviz protobuf hdf5@1.10 pkg-config - - - name: Install Cap’n Proto - run: | - mkdir "${{ runner.workspace }}/capnp" - cd "${{ runner.workspace }}/capnp" - curl -O https://capnproto.org/capnproto-c++-0.9.0.tar.gz - tar zxf capnproto-c++-0.9.0.tar.gz - cd capnproto-c++-0.9.0 - ./configure - make -j - sudo make install + run: brew install ninja doxygen graphviz protobuf hdf5@1.10 pkg-config capnp - name: Checkout uses: actions/checkout@v4 @@ -56,7 +38,7 @@ jobs: - name: Install Python requirements run: | - sudo pip3 install -r "$GITHUB_WORKSPACE/doc/requirements.txt" + sudo pip3 install -r "$GITHUB_WORKSPACE/doc/requirements.txt" --break-system-packages - name: CMake run: | @@ -92,7 +74,7 @@ jobs: -DECAL_THIRDPARTY_BUILD_TCP_PUBSUB=ON \ -DECAL_THIRDPARTY_BUILD_QWT=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH=/usr/local/opt/hdf5@1.10 \ + -DCMAKE_PREFIX_PATH="/usr/local/opt/hdf5@1.10;/usr/local/opt/qt@5" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON \ -DPython_FIND_STRATEGY=LOCATION \