Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 20:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

add extended android support

Browse Source 
Add x64 for <5.14 and multiarch for >=5.14
This commit is contained in:
Skycoder42
2019-11-17 11:24:19 +01:00
parent e8d2ee77ac
commit 150423fd83
7 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ci/generate_azure_pipelines_matrices.py
View File

@@ -72,8 +72,8 @@ mac_build_jobs.append(
# Windows Desktop
windows_build_jobs.extend(
[
BuildJob('5.12.5', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.12.5', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
BuildJob('5.12.6', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.12.6', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
]
)
@@ -84,11 +84,11 @@ windows_build_jobs.append(
windows_build_jobs.extend(
[
BuildJob('5.13.1', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.13.1', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'),
BuildJob('5.13.1', 'windows', 'desktop', 'win64_mingw73', 'mingw73_64'),
BuildJob('5.13.1', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
BuildJob('5.13.1', 'windows', 'desktop', 'win32_mingw73', 'mingw73_32'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_mingw73', 'mingw73_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
BuildJob('5.13.2', 'windows', 'desktop', 'win32_mingw73', 'mingw73_32'),
]
)
@@ -104,20 +104,23 @@ windows_build_jobs.extend(
# Users might develop on Win/Mac, but are most likely to use Linux for CI/CD with
# the Android ecosystem.
for android_arch in ['android_x86', 'android_armv7']:
for android_arch in ['android_x86_64', 'android_arm64_v8a', 'android_x86', 'android_armv7']:
linux_build_jobs.append(
BuildJob('5.13.1', 'linux', 'android', android_arch, android_arch)
BuildJob('5.13.2', 'linux', 'android', android_arch, android_arch)
)
linux_build_jobs.append(
BuildJob('5.14.0', 'linux', 'android', 'android', 'android')
)
# Extra modules test
linux_build_jobs.append(
BuildJob('5.13.1', 'linux', 'desktop', 'gcc_64', 'gcc_64', module='qtnetworkauth')
BuildJob('5.13.2', 'linux', 'desktop', 'gcc_64', 'gcc_64', module='qtnetworkauth')
)
mac_build_jobs.append(
BuildJob('5.13.1', 'mac', 'desktop', 'clang_64', 'clang_64', module='qtnetworkauth')
BuildJob('5.13.2', 'mac', 'desktop', 'clang_64', 'clang_64', module='qtnetworkauth')
)
windows_build_jobs.append(
BuildJob('5.13.1', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qtnetworkauth')
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qtnetworkauth')
)