From ffef9203375be292f107c49392b632adb6c7bd10 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 19 Nov 2024 11:57:33 +0100 Subject: [PATCH] CMake: Raise CI-tested minimum CMake version to 3.22.6 Also change the upper case L to lower case l, because it's changed upstream. Amends 0cfa1fa561d88e5561ad203a9814456a79e93ea6 Pick-to: 6.9 Task-number: QTBUG-131169 Change-Id: I5e501e37bb5516e15a2cbb68cb523ebc5e88d47c Reviewed-by: Nicholas Bennett --- .../provisioning/common/linux/cmake_min_supported.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_min_supported.sh b/coin/provisioning/common/linux/cmake_min_supported.sh index 4c64299b..7113fe47 100755 --- a/coin/provisioning/common/linux/cmake_min_supported.sh +++ b/coin/provisioning/common/linux/cmake_min_supported.sh @@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.16" -version="3.16.8" -PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c" +majorminorversion="3.22" +version="3.22.6" +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz" +SHA1="4a5ba17568d108d295719850dd584e775583f61b" targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" +appPrefix="cmake-$version-linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"