diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 33b7e49c..c798d2c7 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -8,6 +8,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", + "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", @@ -16,6 +17,7 @@ Include: [ "windows-10_22h2-mingw13", "windows-11_23H2-mingw13-developer-build", "windows-11_23H2-llvm", + "windows-11_23H2-msvc2022", "windows-11_22h2-arm64-msvc2022" ], cmake_platforms_qemu_qnx710.yaml: [ @@ -30,7 +32,8 @@ Include: [ "qemu-arm64-developer-build", "qemu-armv7-developer-build", "qemu-mips64-developer-build" - ] + ], + offline_documentation.yaml ] Configurations: - diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index b97cb1b7..16377d93 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -8,6 +8,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", + "ubuntu-24.04-arm64", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", @@ -16,18 +17,20 @@ Include: [ "windows-10_22h2-mingw13", "windows-11_23H2-mingw13-developer-build", "windows-11_23H2-llvm", + "windows-11_23H2-msvc2022", "windows-11_22h2-arm64-msvc2022" ], cmake_platforms_qemu_qnx710.yaml: [ "qnx-710-x86_64-developer-build-on-linux", "qnx-710-arm64-on-linux", "qnx-710-armv7-on-linux" - ] + ], + offline_documentation.yaml ] # Static build configurations for tools Configurations: - - Id: 'macos-latest-xcode-universal-static-build' + Id: 'macos-14-latest-xcode-universal_Static' Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Target arch: 'x86_64-arm64' @@ -46,6 +49,28 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' ] +- + Id: 'Ubuntu-24.04-arm64_Static' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] + Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + ] +- + Id: 'Windows-MSVC2022-arm64_Static' + Template: 'qtci-windows-11_22H2-aarch64-54' + Compiler: 'MSVC2022' + Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests'] + Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', + 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'Windows-MSVC2022_Static' Template: 'qtci-windows-10_22H2-x86_64-53'