aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--coin/platform_configs/qtbase-new-compiler-testing.yaml14
-rw-r--r--coin/platform_configs/qtbase.yaml3
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh1
3 files changed, 17 insertions, 1 deletions
diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml
new file mode 100644
index 00000000..bea7d053
--- /dev/null
+++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml
@@ -0,0 +1,14 @@
+Version: 2
+Configurations:
+# Test gcc-12 on RHEL 9.2
+-
+ Id: 'rhel-9.2-gcc12'
+ Template: 'qtci-linux-RHEL-9.2-x86_64-51'
+ Compiler: 'GCC'
+ Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+ Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
+ Environment variables: [
+ 'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}',
+ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+ ]
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 1d3a13bc..0b847e1e 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -8,6 +8,7 @@ Include: [
linux_android_tests_multi_abi.yaml,
wasm_qtbase_tests.yaml,
cmake_platforms_qemu_vxworks.yaml,
- qtlite.yaml
+ qtlite.yaml,
+ qtbase-new-compiler-testing.yaml
]
Configurations: []
diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
index 9f12a736..dda345ac 100755
--- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
@@ -145,6 +145,7 @@ installPackages+=(perl-Data-Dumper)
installPackages+=(gcc)
installPackages+=(gcc-c++)
installPackages+=(make)
+installPackages+=(gcc-toolset-12)
# Open source VMware Tools
installPackages+=(open-vm-tools)
# nfs-utils is needed to make mount work with ci-files01