From 9d7f75d34b1e202216869730140b1515a524522d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 8 Sep 2022 18:04:36 +0300 Subject: Add ID for all targets All targets should have ID. This way it's easier to refer to needed target Change-Id: I0af8399c3a4c436ab1e778ab4396c65ccd3a373b Reviewed-by: Assam Boudjelthia (cherry picked from commit 92ae8eb4ca1399e48ad5b2dc89dc4be05a33c69f) Reviewed-by: Qt CI Bot --- coin/platform_configs/cmake_platforms.yaml | 32 ++++++++++------ coin/platform_configs/cmake_platforms_qemu.yaml | 10 +++-- .../cmake_platforms_qemu_qnx710.yaml | 10 +++-- .../cmake_platforms_static_tests.yaml | 4 +- .../cmake_platforms_target_android.yaml | 11 ++++-- coin/platform_configs/cmake_platforms_wasm.yaml | 4 +- coin/platform_configs/default.yaml | 1 + coin/platform_configs/integrity.yaml | 4 +- coin/platform_configs/ios-tests.yaml | 4 +- .../linux_android_tests_developer.yaml | 3 +- coin/platform_configs/macos.yaml | 44 +++++++++++----------- ...htly_cmake_platforms_target_android_latest.yaml | 10 ++--- .../nightly_qnx710_host_windows.yaml | 5 ++- coin/platform_configs/precheck.yaml | 6 +-- coin/platform_configs/tqtc-android-automotive.yaml | 10 +++-- coin/platform_configs/webos.yaml | 30 +++++++-------- 16 files changed, 106 insertions(+), 82 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 83aeb02d..45e929e4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -8,13 +8,14 @@ Include: [ ] Configurations: - + Id: 'ubuntu-20.04-documentation' 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 -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' + Id: 'ubuntu-20.04' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'UseConfigure'] @@ -24,7 +25,7 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - - Id: 'OpenSUSE-15.4-host' + Id: 'opensuse-15.4-developer-build' Template: 'qtci-linux-openSUSE-15.4-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] @@ -34,6 +35,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer' ] - + Id: 'sles-15_sp4-static' Template: 'qtci-linux-SLES-15_SP4-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'DisableTests', 'UseConfigure'] @@ -42,6 +44,7 @@ Configurations: 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' ] - + Id: 'windows-10_22h2-msvc2019' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] @@ -52,6 +55,7 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64'] - + Id: 'windows-11_22h2-msvc2019' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] @@ -61,6 +65,7 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] - + Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] @@ -71,6 +76,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - + Id: 'windows-11_22h2-msvc2022' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] @@ -81,7 +87,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Id: 'Windows10_22H2-MSVC2019-x64-host' + Id: 'windows-10_22h2-msvc2019-developer-build' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] @@ -92,11 +98,12 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}' ] - + Id: 'windows-10_22h2-msvc2019-arm64' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] - Platform dependency: 'Windows10_22H2-MSVC2019-x64-host' + Platform dependency: 'windows-10_22h2-msvc2019-developer-build' Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', @@ -107,7 +114,7 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}' ] - - Id: 'Windows11_22H2-MSVC2019-x64-host' + Id: 'windows-11_22h2-msvc2019-developer-build' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] @@ -117,11 +124,12 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}' ] - + Id: 'windows-11_2122-msvc2019-arm64' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] - Platform dependency: 'Windows11_22H2-MSVC2019-x64-host' + Platform dependency: 'windows-11_22h2-msvc2019-developer-build' Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON', @@ -129,7 +137,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64' ] - - Id: 'RHEL-8.4-host' + Id: 'rhel-8.4' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] @@ -146,7 +154,7 @@ Configurations: Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', @@ -154,7 +162,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang' ] - - Id: 'Windows10_22H2-Mingw11-x64-host' + Id: 'windows-10_22h2-mingw11' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure'] @@ -167,7 +175,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw' ] - - Id: 'Windows10_22H2-LLVM-x64-host' + Id: 'windows-10_22h2-llvm' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] @@ -179,7 +187,7 @@ Configurations: 'LLVM_INSTALL_DIR=C:\llvm-mingw' ] - - Id: 'Windows11_22H2-LLVM-x64-host' + Id: 'windows-11_22h2-llvm' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] @@ -191,6 +199,7 @@ Configurations: 'LLVM_INSTALL_DIR=C:\llvm-mingw' ] - + Id: 'windows-10_22h2-mingw11-developer-build' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] @@ -202,6 +211,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] - + Id: 'windows-11_22h2-mingw11-developer-build' Template: 'qtci-windows-11_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index a5bc5b6d..c5d7f48a 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Id: 'qemu-armv7-on-ubuntu20.04' + Id: 'qemu-armv7-developer-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['Sccache', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd', @@ -18,11 +18,12 @@ Configurations: 'QT_QUICK_BACKEND=software', ] - + Id: 'qemu-arm64-developer-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['Sccache', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', @@ -34,11 +35,12 @@ Configurations: 'QT_QUICK_BACKEND=software', ] - + Id: 'qemu-mips64-developer-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'mips64' Compiler: 'GCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 680c3b34..0d1d732c 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Id: 'qnx-x86_64-on-ubuntu20.04' + Id: 'qnx-710-x86_64-developer-build-on-linux' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['Packaging', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', @@ -16,24 +16,26 @@ Configurations: 'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', ] - + Id: 'qnx-710-arm64-on-linux' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'GCC' Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' 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 -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', ] - + Id: 'qnx-710-armv7-on-linux' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' Target arch: 'armv7' Compiler: 'GCC' Target compiler: 'QCC' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['Packaging', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index d87d0edc..e5496965 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Id: 'sles-15-static' + Id: 'sles-15_sp4-minimal-static' Template: 'qtci-linux-SLES-15_SP4-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] @@ -10,6 +10,7 @@ Configurations: 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' ] - + Id: 'windows-10_22h2-minimal-static' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'MSVC2019' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] @@ -19,6 +20,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - + Id: 'macos-11-minimal-static' Template: 'qtci-macos-11-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 3cb87c10..39e1a528 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', @@ -17,12 +17,13 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - + Id: 'android-armv7-on-windows' Template: 'qtci-windows-10_22H2-x86_64-50' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10_22H2-Mingw11-x64-host' + Platform dependency: 'windows-10_22h2-mingw11' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', @@ -33,12 +34,13 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - + Id: 'android-x86-on-linux' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', @@ -49,12 +51,13 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - + Id: 'android-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 8f474e68..ecb516f5 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -4,7 +4,7 @@ Configurations: Template: 'qtci-linux-openSUSE-15.4-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' - Platform dependency: 'OpenSUSE-15.4-host' + Platform dependency: 'opensuse-15.4-developer-build' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', @@ -18,7 +18,7 @@ Configurations: Template: 'qtci-linux-openSUSE-15.4-x86_64-50' Target os: 'WebAssembly' Compiler: 'GCC' - Platform dependency: 'OpenSUSE-15.4-host' + Platform dependency: 'opensuse-15.4-developer-build' Features: ['Sccache', 'DisableTests'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5b287447..34c4ea1d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,6 +1,7 @@ Version: 2 Configurations: - + Id: 'ubuntu-20.04-license-check' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index ada9081c..b8940201 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -1,11 +1,11 @@ Version: 2 Configurations: - - Id: "integrity-arm64-on-ubuntu20.04" + Id: "integrity-arm64" Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Target os: 'INTEGRITY' - Platform dependency: 'Ubuntu-20.04-host' + Platform dependency: 'ubuntu-20.04' Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql', diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index 46b2a471..20221161 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Id: "ios-tests-target" + Id: "ios-tests-on-macos" Template: 'qtci-macos-12-x86_64-105' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index d96f03c1..83348c62 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -1,12 +1,13 @@ Version: 2 Configurations: - + Id: 'android-x86-developer-build-testrun-on-linux' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index fdbd8f2c..f8901e8f 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -8,7 +8,7 @@ Configurations: # Build on recent macOS version with latest Xcode - - Id: 'macos-latest-xcode-universal-packaging-build' + Id: 'macos-universal-on-x86_64' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' @@ -21,7 +21,7 @@ Configurations: ] - - Id: 'macos-latest-xcode-arm64-universal-build' + Id: 'macos-universal-on-arm64' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Target arch: 'x86_64-arm64' @@ -38,55 +38,55 @@ Configurations: Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-10.15-x86_64-tests' Template: 'qtci-macos-10.15-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-11-x86_64-tests' Template: 'qtci-macos-11-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-11-arm64-tests' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-12-arm64-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-13-arm64-tests' Template: 'qtci-macos-13-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-12-x86_64-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' - - Id: 'macos-12-arm64-arm64-universal-build-tests' + Id: 'macos-12-arm-on-arm64-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-arm64-universal-build' + Platform dependency: 'macos-universal-on-arm64' - - Id: 'macos-12-x86_64-arm64-universal-build-tests' + Id: 'macos-12-arm-on-x86_64-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-arm64-universal-build' + Platform dependency: 'macos-universal-on-arm64' # ========================================================================= # Developer build. Single architecture builds. @@ -95,7 +95,7 @@ Configurations: # Build on recent macOS version with latest Xcode - - Id: 'macos-latest-xcode-x86_64-developer-build' + Id: 'macos-12-x86_64-developer-build' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -105,7 +105,7 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - - Id: 'macos-latest-xcode-arm64-developer-build' + Id: 'macos-12-arm64-developer-build' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] @@ -120,40 +120,40 @@ Configurations: Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + Platform dependency: 'macos-12-x86_64-developer-build' - Id: 'macos-10.15-x86_64-developer-build-tests' Template: 'qtci-macos-10.15-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + Platform dependency: 'macos-12-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' Template: 'qtci-macos-11-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + Platform dependency: 'macos-12-x86_64-developer-build' - Id: 'macos-11-arm64-developer-build-tests' Template: 'qtci-macos-11.0-arm64' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-latest-xcode-arm64-developer-build' + Platform dependency: 'macos-12-arm64-developer-build' - Id: 'macos-12-x86_64-developer-build-tests' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] - Platform dependency: 'macos-latest-xcode-x86_64-developer-build' + Platform dependency: 'macos-12-x86_64-developer-build' - Id: 'macos-12-arm64-developer-build-tests' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-latest-xcode-arm64-developer-build' + Platform dependency: 'macos-12-arm64-developer-build' - Id: 'macos-13-arm64-developer-build-tests' Template: 'qtci-macos-13-arm64' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-latest-xcode-arm64-developer-build' + Platform dependency: 'macos-12-arm64-developer-build' diff --git a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml index dfcbf5ce..810fb02c 100644 --- a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml +++ b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml @@ -2,10 +2,10 @@ Version: 2 Include: [ cmake_platforms.yaml: [ Windows10_22H2-Mingw11-x64-host, - RHEL-8.4-host + rhel-8.4 ], macos.yaml: [ - macos-latest-xcode-universal-packaging-build + macos-universal-on-x86_64 ] ] Configurations: @@ -16,7 +16,7 @@ Configurations: Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' - Platform dependency: 'macos-latest-xcode-universal-packaging-build' + Platform dependency: 'macos-universal-on-x86_64' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', @@ -47,7 +47,7 @@ Configurations: Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', @@ -63,7 +63,7 @@ Configurations: Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index 852b6f78..614a982f 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -1,17 +1,18 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - Windows10_22H2-MSVC2019-x64-host + windows-10_22h2-msvc2019-developer-build ] ] Configurations: - + Id: 'qnx-710-arm64-on-windows' Template: 'qtci-windows-10_22H2-x86_64-50' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' Target compiler: 'QCC' - Platform dependency: 'Windows10_22H2-MSVC2019-x64-host' + Platform dependency: 'windows-10_22h2-msvc2019-developer-build' Features: ['DisableTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch', diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index 25583ec1..7293660e 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -3,7 +3,7 @@ Module only: True Include: [ cmake_platforms.yaml: [ "Ubuntu-20.04-host", - "Windows10_22H2-MSVC2019-x64-host", + "windows-10_22h2-msvc2019-developer-build", "ios-universal" ], macos.yaml: [ @@ -13,10 +13,10 @@ Include: [ "android-arm64-on-macos" ], cmake_platforms_qemu.yaml: [ - "qemu-armv7-on-ubuntu20.04" + "qemu-armv7-developer-build" ], cmake_platforms_qemu_qnx710.yaml: [ - "qnx-x86_64-on-ubuntu20.04" + "qnx-710-x86_64-developer-build-on-linux" ] ] Configurations: [] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 993f59d6..89ab1d33 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -2,12 +2,13 @@ Version: 2 Include: [ cmake_platforms_target_android.yaml ] Configurations: - + Id: 'automotive-ubuntu-20.04-documentation' 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 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' - - Id: 'Windows10_22H2-Mingw11-x64-host' + Id: 'automotive-windows-10_22h2-mingw11' Template: 'qtci-windows-10_22H2-x86_64-50' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure'] @@ -19,7 +20,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] - - Id: 'macos-latest-xcode-universal-packaging-build' + Id: 'macos-universal-on-x86_64' Template: 'qtci-macos-12-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' @@ -31,7 +32,7 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' ] - - Id: 'RHEL-8.4-host' + Id: 'rhel-8.4' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure'] @@ -41,12 +42,13 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc' ] - + Id: "automotive-android-x86-on-linux" Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' + Platform dependency: 'rhel-8.4' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', diff --git a/coin/platform_configs/webos.yaml b/coin/platform_configs/webos.yaml index 277d21e5..200a91b7 100644 --- a/coin/platform_configs/webos.yaml +++ b/coin/platform_configs/webos.yaml @@ -1,54 +1,54 @@ Version: 2 Module only: true Configurations: - - Id: 'WebOS-emulator-build' + - Id: 'webos-emulator-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_EMULATOR=enabled'] - - Id: 'WebOS-emulator-qtbase-tests' + - Id: 'webos-emulator-qtbase-tests' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtbase'] - Platform dependency: 'WebOS-emulator-build' - - Id: 'WebOS-emulator-qtdeclarative-tests' + Platform dependency: 'webos-emulator-build' + - Id: 'webos-emulator-qtdeclarative-tests' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtdeclarative'] - Platform dependency: 'WebOS-emulator-build' - - Id: 'WebOS-emulator-qtwayland-tests' + Platform dependency: 'webos-emulator-build' + - Id: 'webos-emulator-qtwayland-tests' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtwayland'] - Platform dependency: 'WebOS-emulator-build' - - Id: 'WebOS-emulator-qtshadertools-tests' + Platform dependency: 'webos-emulator-build' + - Id: 'webos-emulator-qtshadertools-tests' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtshadertools'] - Platform dependency: 'WebOS-emulator-build' - - Id: 'WebOS-emulator-qtgraphicaleffects-tests' + Platform dependency: 'webos-emulator-build' + - Id: 'webos-emulator-qtgraphicaleffects-tests' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtgraphicaleffects'] - Platform dependency: 'WebOS-emulator-build' - - Id: 'WebOS-raspberry-build' + Platform dependency: 'webos-emulator-build' + - Id: 'webos-raspberry-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_RASPBERRY=enabled'] - - Id: 'WebOS-NDK-installer-build' + - Id: 'webos-ndk-installer-build' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_NDK_INSTALLER=enabled'] - - Id: 'WebOS-NDK-install' + - Id: 'webos-ndk-install' Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly'] - Platform dependency: ['WebOS-raspberry-build', 'WebOS-NDK-installer-build'] + Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build'] Environment variables: ['TEST_INSTALL_NDK=enabled'] -- cgit v1.2.3