Skip to content

Commit 31d4580

Browse files
committed
CI: install Qt with brew on macOS
GitHub macos-latest runner seems to have switched to arm64 by default but jurplel/install-qt-action@v3 just provides x86_64 binaries
1 parent 19d860c commit 31d4580

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

.github/workflows/ci_linux_arm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
apt-get -y install qtbase5-dev libqt5svg5-dev
4242
apt-get -y install libxcb-cursor0 # Dependencies for "xcb" Qt plugin(actually needed for Qt6)
4343
apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
44-
apt-get -y install libtbb2-dev libxi-dev # Dependencies for OpenCascade v7.5
44+
apt-get -y install libxi-dev # Dependencies for OpenCascade v7.5(maybe needs libtbb2-dev)
4545
apt-get -y install libassimp-dev
4646
;;
4747
fedora*)

.github/workflows/ci_macos.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,13 @@ jobs:
1111
uses: actions/checkout@v2
1212

1313
- name: Install Qt
14-
uses: jurplel/install-qt-action@v3
15-
with:
16-
cache: true
17-
cache-key-prefix: QtCache
14+
run: brew install qt@5
1815

1916
- name: Install OpenCascade
20-
run: |
21-
brew install opencascade
17+
run: brew install opencascade
2218

2319
- name: Install Assimp
24-
run: |
25-
brew install assimp
20+
run: brew install assimp
2621

2722
- name: Get count of CPU cores
2823
uses: SimenB/github-actions-cpu-cores@v1
@@ -35,7 +30,8 @@ jobs:
3530
cmake --version
3631
cmake .. \
3732
-DMayo_BuildTests=ON \
38-
-DMayo_BuildPluginAssimp=ON
33+
-DMayo_BuildPluginAssimp=ON \
34+
-DQT_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
3935
cmake --build . \
4036
--config Release \
4137
--parallel ${{steps.cpu-cores.outputs.count}}

0 commit comments

Comments
 (0)