Skip to content

Commit bce6191

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

File tree

6 files changed

+6
-18
lines changed

6 files changed

+6
-18
lines changed

.github/workflows/ci-macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
cd build
7272
7373
echo "::group::CMake"
74-
cmake .. \
74+
cmake ${GITHUB_WORKSPACE} \
7575
-DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
7676
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
7777
-DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \

.github/workflows/ci-windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
cd build
6767
6868
echo "::group::CMake"
69-
cmake .. \
69+
cmake ${GITHUB_WORKSPACE} \
7070
-GNinja \
7171
-DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \
7272
-DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \

.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

+1-4
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

.github/workflows/release-windows.yml

+1-4
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 \

0 commit comments

Comments
 (0)