From bd7cda82712701da1d7f555740efeb4e2c0ec930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Guilloux?= Date: Thu, 3 Apr 2025 12:54:56 +0200 Subject: [PATCH] Revert f719fa678f: [CI] The fix is now implemented at vcpkg level (#13942) --- .github/workflows/release-docs.yml | 5 +---- .github/workflows/release-linux.yml | 5 +---- .github/workflows/release-macos.yml | 15 +++------------ .github/workflows/release-windows.yml | 15 +++------------ 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml index 3f1de96629..c811e01e18 100644 --- a/.github/workflows/release-docs.yml +++ b/.github/workflows/release-docs.yml @@ -43,10 +43,7 @@ jobs: cd ${GITHUB_WORKSPACE}/build echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_DOCS_ONLY=ON \ # EOF diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index 8711bf373a..d6f79057d2 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -136,10 +136,7 @@ jobs: cd build echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \ diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 97de21ece3..db063ab8c4 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -74,10 +74,7 @@ jobs: cd build-host echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DOPTION_TOOLS_ONLY=ON \ # EOF @@ -104,10 +101,7 @@ jobs: cd build-arm64 echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DVCPKG_TARGET_TRIPLET=arm64-osx \ -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ @@ -128,10 +122,7 @@ jobs: cd build-x64 echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DVCPKG_TARGET_TRIPLET=x64-osx \ -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \ diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index bde737469f..d47b3645e5 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -84,10 +84,7 @@ jobs: cd build-host echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -GNinja \ -DOPTION_TOOLS_ONLY=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -111,10 +108,7 @@ jobs: cd build echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -GNinja \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \ @@ -144,10 +138,7 @@ jobs: cd build echo "::group::CMake" - # CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it. - # Yet, they are fully compatible with 3.5, and so there is no problem - # forcing them to upgrade. - CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \ + cmake ${GITHUB_WORKSPACE} \ -GNinja \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \ -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \