Skip to content

Commit 1914088

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

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,28 @@ jobs:
1515
strategy:
1616
matrix:
1717
qt_version: [5.12.11, 5.15.2, 6.2.0]
18-
platform: [ubuntu-latest, windows-latest, macos-15]
18+
platform: [ubuntu-latest, windows-latest, macos-13, macos-15]
19+
exclude:
20+
# Qt 5.12.11 doesn't support ARM64 on macOS
21+
- qt_version: 5.12.11
22+
platform: macos-15
1923
include:
2024
- qt_version: 6.2.0
2125
additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6
2226
- platform: ubuntu-latest
2327
make: make
2428
CXXFLAGS: -Wall -Wextra -pedantic -Werror
2529
MAKEFLAGS: -j2
30+
- platform: macos-13
31+
make: make
32+
CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments # Ignore false-positive warning for qCWarning
33+
MAKEFLAGS: -j3
34+
qt_arch: clang_64
2635
- platform: macos-15
2736
make: make
2837
CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-gnu-zero-variadic-macro-arguments # Ignore false-positive warning for qCWarning
2938
MAKEFLAGS: -j3
39+
qt_arch: clang_64
3040
- platform: windows-latest
3141
make: nmake
3242
CXXFLAGS: /W4 /WX /MP
@@ -38,12 +48,13 @@ jobs:
3848

3949
steps:
4050
- name: Clone repo
41-
uses: actions/checkout@v2
51+
uses: actions/checkout@v4
4252

4353
- name: Install Qt
4454
uses: jurplel/install-qt-action@v4
4555
with:
4656
version: ${{ matrix.qt_version }}
57+
arch: ${{ matrix.qt_arch }}
4758

4859
- name: Build with CMake as static
4960
run: |
@@ -57,6 +68,7 @@ jobs:
5768
5869
- name: Setup MSVC environment for QMake
5970
uses: ilammy/msvc-dev-cmd@v1
71+
if: matrix.platform == 'windows-latest'
6072

6173
- name: Build with QMake as static
6274
working-directory: HotkeyTest

0 commit comments

Comments
 (0)