Skip to content

Commit fb61355

Browse files
committed
Revert f719fa6: [CI] The fix is now implemented at vcpkg level
1 parent 2f36e3e commit fb61355

File tree

4 files changed

+8
-32
lines changed

4 files changed

+8
-32
lines changed

.github/workflows/release-docs.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ jobs:
4343
cd ${GITHUB_WORKSPACE}/build
4444
4545
echo "::group::CMake"
46-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
47-
# Yet, they are fully compatible with 3.5, and so there is no problem
48-
# forcing them to upgrade.
49-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
46+
cmake ${GITHUB_WORKSPACE} \
5047
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
5148
-DOPTION_DOCS_ONLY=ON \
5249
# EOF

.github/workflows/release-linux.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,7 @@ jobs:
136136
cd build
137137
138138
echo "::group::CMake"
139-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
140-
# Yet, they are fully compatible with 3.5, and so there is no problem
141-
# forcing them to upgrade.
142-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
139+
cmake ${GITHUB_WORKSPACE} \
143140
-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \
144141
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
145142
-DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \

.github/workflows/release-macos.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ jobs:
7474
cd build-host
7575
7676
echo "::group::CMake"
77-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
78-
# Yet, they are fully compatible with 3.5, and so there is no problem
79-
# forcing them to upgrade.
80-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
77+
cmake ${GITHUB_WORKSPACE} \
8178
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
8279
-DOPTION_TOOLS_ONLY=ON \
8380
# EOF
@@ -104,10 +101,7 @@ jobs:
104101
cd build-arm64
105102
106103
echo "::group::CMake"
107-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
108-
# Yet, they are fully compatible with 3.5, and so there is no problem
109-
# forcing them to upgrade.
110-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
104+
cmake ${GITHUB_WORKSPACE} \
111105
-DCMAKE_OSX_ARCHITECTURES=arm64 \
112106
-DVCPKG_TARGET_TRIPLET=arm64-osx \
113107
-DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
@@ -128,10 +122,7 @@ jobs:
128122
cd build-x64
129123
130124
echo "::group::CMake"
131-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
132-
# Yet, they are fully compatible with 3.5, and so there is no problem
133-
# forcing them to upgrade.
134-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
125+
cmake ${GITHUB_WORKSPACE} \
135126
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
136127
-DVCPKG_TARGET_TRIPLET=x64-osx \
137128
-DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \

.github/workflows/release-windows.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ jobs:
8484
cd build-host
8585
8686
echo "::group::CMake"
87-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
88-
# Yet, they are fully compatible with 3.5, and so there is no problem
89-
# forcing them to upgrade.
90-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
87+
cmake ${GITHUB_WORKSPACE} \
9188
-GNinja \
9289
-DOPTION_TOOLS_ONLY=ON \
9390
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -111,10 +108,7 @@ jobs:
111108
cd build
112109
113110
echo "::group::CMake"
114-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
115-
# Yet, they are fully compatible with 3.5, and so there is no problem
116-
# forcing them to upgrade.
117-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
111+
cmake ${GITHUB_WORKSPACE} \
118112
-GNinja \
119113
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
120114
-DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
@@ -144,10 +138,7 @@ jobs:
144138
cd build
145139
146140
echo "::group::CMake"
147-
# CMake 4.0.0 deprecated < 3.5, but some vcpkg packages still use it.
148-
# Yet, they are fully compatible with 3.5, and so there is no problem
149-
# forcing them to upgrade.
150-
CMAKE_POLICY_VERSION_MINIMUM=3.5 cmake ${GITHUB_WORKSPACE} \
141+
cmake ${GITHUB_WORKSPACE} \
151142
-GNinja \
152143
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
153144
-DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \

0 commit comments

Comments
 (0)