Skip to content

Commit e83b197

Browse files
committed
Update build_tests_macos.yml
1 parent b2fad50 commit e83b197

1 file changed

Lines changed: 14 additions & 17 deletions

File tree

.github/workflows/build_tests_macos.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ on:
1313
pull_request:
1414

1515
env:
16-
QT_VERSION: 5.14.1
17-
QT_PACKAGES: qtwebengine
16+
QT_VERSION: 6.5.3
17+
QT_PACKAGES: qtwebengine qtwebchannel qtpositioning qt5compat
1818
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1919

20+
# https://doc.qt.io/qt-6/macos.html
2021
jobs:
2122
build:
2223
name: ${{ matrix.config.name }}
@@ -26,20 +27,16 @@ jobs:
2627
fail-fast: false
2728
matrix:
2829
config:
29-
- {
30-
name: "Cmake : Qt5 + WebEngine",
31-
os: macos-13,
32-
setup: "cmake -DUSE_STATIC_CHMLIB=ON -DUSE_WEBENGINE=ON .",
33-
build: "cmake --build . --config Release",
34-
install: "sudo cmake --install . --config Release"
35-
}
36-
- {
37-
name: "qmake : Qt5 + WebEngine",
38-
os: macos-13,
39-
setup: 'qmake -r -early "QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib" "USE_STATIC_CHMLIB=1" "USE_WEBENGINE=1" "LIBZIP_ROOT=/usr/local"',
40-
build: "make",
41-
install: "echo skip"
42-
}
30+
- name: Cmake
31+
os: macos-15
32+
setup: 'cmake -DCMAKE_OSX_ARCHITECTURES="arm64" -DUSE_STATIC_CHMLIB=ON -DUSE_WEBENGINE=ON .'
33+
build: 'cmake --build . --config Release'
34+
install: 'sudo cmake --install . --config Release'
35+
- name: Qmake
36+
os: macos-15
37+
setup: 'qmake -r -early "QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib" "QMAKE_APPLE_DEVICE_ARCHS=arm64" "USE_STATIC_CHMLIB=1" "USE_WEBENGINE=1" "LIBZIP_ROOT=/usr/local"'
38+
build: 'make'
39+
install: 'echo skip'
4340

4441
steps:
4542
- name: checkout
@@ -62,7 +59,7 @@ jobs:
6259
git checkout v1.11.4
6360
mkdir build
6461
cd build
65-
cmake ..
62+
cmake -DCMAKE_OSX_ARCHITECTURES="arm64" ..
6663
cmake --build . --config Release
6764
sudo cmake --install . --config Release
6865

0 commit comments

Comments
 (0)