Skip to content

Commit 705b2f1

Browse files
committed
fixup! Upgrade to install-qt-action@v4
1 parent 50d6ac9 commit 705b2f1

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

.github/workflows/integration.yaml

+27-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
platform: ['android', 'linux', 'ios', 'macos', 'mingw-gcc', 'mingw-llvm', 'msvc']
1414

1515
include:
16-
# ----------------------------------------------------------------------- select Github runner for each platform
16+
# ----------------------------------------------------------------------- select platform specific Github runner
1717
- platform: android
1818
runner: ubuntu-latest
1919
- platform: linux
@@ -31,13 +31,13 @@ jobs:
3131
- platform: msvc
3232
runner: windows-latest
3333

34-
# --------------------------------------------------------------------------- select Qt target for each platform
34+
# --------------------------------------------------------------------------- select platform specific Qt target
3535
- platform: android
3636
target: android
3737
- platform: ios
3838
target: ios
3939

40-
# --------------------------------------------------------------------- select Qt architecture for each platform
40+
# --------------------------------------------------------------------- select platform specific Qt architecture
4141
- platform: android
4242
arch: android_arm64_v8a
4343
- platform: android
@@ -57,11 +57,32 @@ jobs:
5757
arch: win64_llvm_mingw
5858

5959
- platform: msvc
60-
arch: msvc2019_64
60+
win64_msvc2019_64
6161
- platform: msvc
6262
version: '6.8.0'
6363
arch: win64_msvc2022_64
6464

65+
# ------------------------------------------------------------------------- select platform specific CMake flags
66+
- platform: android
67+
cmake-flags: [
68+
'-DANDROID_ABI:STRING=arm64-v8a',
69+
'-DANDROID_PLATFORM:STRING=android-23',
70+
'-DANDROID_SDK_ROOT:PATH=$ANDROID_SDK_ROOT',
71+
'-DANDROID_NDK:PATH=$ANDROID_NDK_ROOT',
72+
'-DANDROID_STL:STRING=c++_shared',
73+
'-DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF',
74+
'-DQT_HOST_PATH:PATH=$QT_ROOT_DIR/../gcc_64',
75+
'-DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON',
76+
'-GNinja', '--toolchain', '$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake',
77+
]
78+
79+
- platform: ios
80+
cmake-flags: [
81+
'-DCMAKE_SYSTEM_NAME:STRING=iOS',
82+
'-DQT_HOST_PATH:PATH=$QT_ROOT_DIR/../macos',
83+
'-GXcode',
84+
]
85+
6586
exclude:
6687
- platform: mingw-llvm
6788
version: '5.15.2'
@@ -160,9 +181,8 @@ jobs:
160181
161182
- name: Configure
162183
working-directory: ${{runner.workspace}}/build
163-
run: |
164-
cmake ${{github.workspace}} \
165-
-DCMAKE_BUILD_TYPE:STRING=Release \
184+
run: cmake ${{github.workspace}}
185+
-DCMAKE_BUILD_TYPE:STRING=Release
166186
${{ join(matrix.cmake-flags, ' ') }}
167187

168188
- uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)