Skip to content

Commit

Permalink
CI: install Qt with brew on macOS
Browse files Browse the repository at this point in the history
GitHub macos-latest runner seems to have switched to arm64
by default but jurplel/install-qt-action@v3 just provides
x86_64 binaries
  • Loading branch information
HuguesDelorme committed Apr 26, 2024
1 parent 19d860c commit 15709b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_linux_arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
apt-get -y install qtbase5-dev libqt5svg5-dev
apt-get -y install libxcb-cursor0 # Dependencies for "xcb" Qt plugin(actually needed for Qt6)
apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
apt-get -y install libtbb2-dev libxi-dev # Dependencies for OpenCascade v7.5
apt-get -y install libtbb-dev libxi-dev # Dependencies for OpenCascade
apt-get -y install libassimp-dev
;;
fedora*)
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,13 @@ jobs:
uses: actions/checkout@v2

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
cache: true
cache-key-prefix: QtCache
run: brew install qt@5

- name: Install OpenCascade
run: |
brew install opencascade
run: brew install opencascade

- name: Install Assimp
run: |
brew install assimp
run: brew install assimp

- name: Get count of CPU cores
uses: SimenB/github-actions-cpu-cores@v1
Expand All @@ -35,7 +30,8 @@ jobs:
cmake --version
cmake .. \
-DMayo_BuildTests=ON \
-DMayo_BuildPluginAssimp=ON
-DMayo_BuildPluginAssimp=ON \
-DQT_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
cmake --build . \
--config Release \
--parallel ${{steps.cpu-cores.outputs.count}}
Expand Down

0 comments on commit 15709b5

Please sign in to comment.