From dd2f96bcee26125dfe4edbc55aa660017174677e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 1 Sep 2024 10:03:05 +0200 Subject: [PATCH] platform_configs: remove qtbase-linux-arm64-offscreen.yaml We have u2404 arm64 offscreen tested in qt5 since 420b779335d18da9074ac0f192a668a5dd68739b. Pick-to: 6.8 Change-Id: Ibbb7d275d4abe4fc73646747939b2361c5317b26 Reviewed-by: Jukka Jokiniva Reviewed-by: Tero Heikkinen --- .../qtbase-linux-arm64-offscreen.yaml | 26 ------------------- coin/platform_configs/qtbase.yaml | 1 - 2 files changed, 27 deletions(-) delete mode 100644 coin/platform_configs/qtbase-linux-arm64-offscreen.yaml diff --git a/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml b/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml deleted file mode 100644 index 6b19d35ce4d..00000000000 --- a/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml +++ /dev/null @@ -1,26 +0,0 @@ -Version: 2 -Configurations: -# Test on Ubuntu 24.04 ARM64 offscreen -- - Id: 'ubuntu-24.04-arm64-offscreen-qtbase-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'ubuntu-24.04-arm64' -# Test on Debian-11.6 offscreen -- - Id: 'debian-11.6-arm64-offscreen-qtbase-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'debian-11.6-arm64' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index c72bbabdf77..39fbc7e225d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -10,7 +10,6 @@ Include: [ cmake_platforms_qemu_vxworks_buildtest_static.yaml, cmake_platforms_qemu_vxworks_tests_static.yaml, qtlite.yaml, - qtbase-linux-arm64-offscreen.yaml, qtbase-new-compiler-testing.yaml ] Configurations: []