1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-20 13:09:15 +00:00

Revert f719fa678f: [CI] The fix is now implemented at vcpkg level

This commit is contained in:
glx22
2025-04-01 18:55:58 +02:00
parent 2f36e3e3a1
commit fb61355a86
4 changed files with 8 additions and 32 deletions

View File

@@ -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

View File

@@ -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 }} \

View File

@@ -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 \

View File

@@ -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" \