aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/cmake_platforms.yaml11
-rw-r--r--coin/platform_configs/cmake_platforms_qemu_qnx710.yaml12
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_linux.yaml2
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_macos.yaml8
-rw-r--r--coin/platform_configs/cmake_platforms_wasm.yaml2
-rw-r--r--coin/platform_configs/ios-tests.yaml2
-rw-r--r--coin/platform_configs/macos.yaml12
-rw-r--r--coin/platform_configs/precheck.yaml2
-rw-r--r--coin/platform_configs/tqtc-android-automotive.yaml4
9 files changed, 31 insertions, 24 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 1747e24a..0fbc300c 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -13,7 +13,7 @@ Configurations:
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
- Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+ Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'Ubuntu-20.04-host'
@@ -51,6 +51,7 @@ Configurations:
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
-
Template: 'qtci-windows-11_21H2-x86_64-51'
@@ -59,6 +60,7 @@ Configurations:
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
-
Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -136,11 +138,12 @@ Configurations:
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
Environment variables: [
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
- 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'
+ 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'ios-universal'
- Template: 'qtci-macos-11-x86_64-104'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -161,7 +164,7 @@ Configurations:
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
- 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
+ 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
]
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
index 9986db36..0bd9ce14 100644
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -8,10 +8,10 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
- Features: ['Packaging', 'VMSize8', 'UseConfigure', 'Insignificant']
+ Features: ['Packaging', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'QT_CMAKE_DIR=/opt/cmake-3.21.3/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
]
@@ -22,10 +22,10 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
- Features: ['Packaging', 'DisableTests', 'UseConfigure', 'Insignificant']
+ Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -34,8 +34,8 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
- Features: ['Packaging', 'DisableTests', 'UseConfigure', 'Insignificant']
+ Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
index 06923f7f..dea0b437 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -35,7 +35,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
index 92614934..66f296dc 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: 'android-arm64-on-macos'
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
@@ -16,7 +16,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
]
-
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Clang'
@@ -30,7 +30,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang'
]
-
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Clang'
@@ -44,7 +44,7 @@ Configurations:
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
]
-
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index d13d0b29..e54113d8 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -38,7 +38,7 @@ Configurations:
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang']
-
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml
index 71f1d032..cc651ff2 100644
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -2,7 +2,7 @@ Version: 2
Configurations:
-
Id: "ios-tests-target"
- Template: 'qtci-macos-10.14-x86_64'
+ Template: 'qtci-macos-12-x86_64-102'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index 3cc87e75..40bea2fd 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -16,7 +16,7 @@ Configurations:
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
- 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
+ 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
@@ -25,8 +25,11 @@ Configurations:
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
- Features: ['DoNotRunTests', 'WarningsAreErrors']
- Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON'
+ Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+ Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+ Environment variables: [
+ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
+ ]
# Test on all supported macOS versions (deployment targets)
@@ -92,7 +95,8 @@ Configurations:
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
- 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
+ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'macos-latest-xcode-arm64-developer-build'
diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml
index 9445c652..fca9190f 100644
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -7,7 +7,7 @@ Include: [
"ios-universal"
],
macos.yaml: [
- "macos-12-arm64-tests",
+ "macos-12-x86_64-tests",
],
cmake_platforms_target_android_host_macos.yaml: [
"android-arm64-on-macos"
diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml
index cf561270..6b2c0ac3 100644
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -9,7 +9,7 @@ Configurations:
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
- Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+ Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
-
Id: 'Windows10_21H2-Mingw11-x64-host'
@@ -52,7 +52,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',