From dcd057a31b54de637a5ca8bb8a5d46e753d3066a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 2 Jan 2025 11:25:47 +0100 Subject: [PATCH] Revert "CMake: Temporarily allow using any version in Qt's CI" We updated the minimum CMake version used in CI for Qt 6.9+ to 3.22. Enforce the minimum CMake version in CI to avoid regressions. This reverts commit 5803af38aab09b7e47230a494e14654031d024e7. Pick-to: 6.9 Task-number: QTBUG-131169 Change-Id: Ifc91644dd26e465be44bfa7cfe6f99e295a174a9 Reviewed-by: Alexey Edelev --- cmake/QtCMakeVersionHelpers.cmake | 5 ++--- cmake/QtPublicCMakeVersionHelpers.cmake | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cmake/QtCMakeVersionHelpers.cmake b/cmake/QtCMakeVersionHelpers.cmake index c2349bd5d15..3a3ba0fc750 100644 --- a/cmake/QtCMakeVersionHelpers.cmake +++ b/cmake/QtCMakeVersionHelpers.cmake @@ -169,9 +169,8 @@ function(qt_internal_force_allow_unsuitable_cmake_version_for_building_qt out_va # Temporarily allow any version when building in Qt's CI, so we can decouple the provisioning # of the minimum CMake version from the bump of the minimum CMake version. # The COIN_UNIQUE_JOB_ID env var is set in Qt's CI for both build and test work items. - # Current state is that this check is enabled. - # TODO: Disable it once provisioning is merged. - set(allow_any_version_in_ci TRUE) + # Current state is that this check is disabled. + set(allow_any_version_in_ci FALSE) if(allow_any_version_in_ci AND DEFINED ENV{COIN_UNIQUE_JOB_ID}) set(allow_any_version TRUE) diff --git a/cmake/QtPublicCMakeVersionHelpers.cmake b/cmake/QtPublicCMakeVersionHelpers.cmake index e0046c4ce16..58c7aa80417 100644 --- a/cmake/QtPublicCMakeVersionHelpers.cmake +++ b/cmake/QtPublicCMakeVersionHelpers.cmake @@ -55,9 +55,8 @@ function(__qt_internal_force_allow_unsuitable_cmake_version_for_using_qt out_var # Temporarily allow any version when using Qt in Qt's CI, so we can decouple the provisioning # of the minimum CMake version from the bump of the minimum CMake version. # The COIN_UNIQUE_JOB_ID env var is set in Qt's CI for both build and test work items. - # Current state is that this check is enabled. - # TODO: Disable it once provisioning is merged. - set(allow_any_version_in_ci TRUE) + # Current state is that this check is disabled. + set(allow_any_version_in_ci FALSE) if(allow_any_version_in_ci AND DEFINED ENV{COIN_UNIQUE_JOB_ID}) set(allow_any_version TRUE)