Skip to content

Commit dc08dc6

Browse files
committed
ci: try to fix macos build
Signed-off-by: Patrizio Bekerle <[email protected]>
1 parent 3040875 commit dc08dc6

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,25 @@ jobs:
1414
build:
1515
strategy:
1616
matrix:
17-
qt_version: [5.12.11, 5.15.2, 6.2.0]
18-
platform: [ubuntu-latest, windows-latest, macos-15]
17+
qt_version: [5.15.2, 6.2.0]
18+
platform: [ubuntu-latest, windows-latest, macos-13, macos-15]
1919
include:
2020
- qt_version: 6.2.0
2121
additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
2222
- platform: ubuntu-latest
2323
make: make
2424
CXXFLAGS: -Wall -Wextra -pedantic -Werror
2525
MAKEFLAGS: -j2
26+
- platform: macos-13
27+
make: make
28+
CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments # Ignore false-positive warning for qCWarning
29+
MAKEFLAGS: -j3
30+
qt_arch: clang_arm64
2631
- platform: macos-15
2732
make: make
2833
CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments # Ignore false-positive warning for qCWarning
2934
MAKEFLAGS: -j3
35+
qt_arch: clang_arm64
3036
- platform: windows-latest
3137
make: nmake
3238
CXXFLAGS: /W4 /WX /MP
@@ -38,12 +44,13 @@ jobs:
3844

3945
steps:
4046
- name: Clone repo
41-
uses: actions/checkout@v2
47+
uses: actions/checkout@v4
4248

4349
- name: Install Qt
4450
uses: jurplel/install-qt-action@v4
4551
with:
4652
version: ${{ matrix.qt_version }}
53+
arch: ${{ matrix.qt_arch }}
4754

4855
- name: Build with CMake as static
4956
run: |
@@ -57,6 +64,7 @@ jobs:
5764
5865
- name: Setup MSVC environment for QMake
5966
uses: ilammy/msvc-dev-cmd@v1
67+
if: matrix.platform == 'windows-latest'
6068

6169
- name: Build with QMake as static
6270
working-directory: HotkeyTest

0 commit comments

Comments
 (0)