From c3224d51588dbb467f8d155ebf9340fa537c13e7 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Feb 2025 10:48:15 +0100 Subject: [PATCH] COIN: Bump to Qt 6.8.2 Change-Id: I15b82b353011614116a0004c2ffb4916d613c228 Reviewed-by: Eike Ziller --- .github/workflows/build_cmake.yml | 2 +- coin/instructions/common_environment.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 3d61517d7a7..6665ca55add 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -7,7 +7,7 @@ on: - 'doc/**' env: - QT_VERSION: 6.8.1 + QT_VERSION: 6.8.2 MACOS_DEPLOYMENT_TARGET: 11.0 CLANG_VERSION: 19.1.6 ELFUTILS_VERSION: 0.175 diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 74f0ab2e1f9..deceddb7a4a 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -7,7 +7,7 @@ instructions: instructions: - type: EnvironmentVariable variableName: QTC_QT_BASE_URL - variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/qt/6.8.0/release_content/" + variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/qt/6.8.2/release_content/" - type: EnvironmentVariable variableName: MACOSX_DEPLOYMENT_TARGET variableValue: 12.0 @@ -88,7 +88,7 @@ instructions: instructions: - type: EnvironmentVariable variableName: QTC_QT_POSTFIX - variableValue: "-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" + variableValue: "-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z" - type: EnvironmentVariable variableName: QTC_ICU_URL variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/73.2/icu-linux-g++-Rhel8.6-x64.7z" @@ -141,7 +141,7 @@ instructions: instructions: - type: EnvironmentVariable variableName: QTC_QT_POSTFIX - variableValue: "-Linux-Debian_11_6-GCC-Linux-Debian_11_6-AARCH64.7z" + variableValue: "-Linux-Ubuntu_24_04-GCC-Linux-Ubuntu_24_04-AARCH64.7z" - type: EnvironmentVariable variableName: QTC_SDKTOOL_QT_EXT variableValue: ".tar.xz"