ci: upgrade vcpkg to a commit that works for our deps with CMake 4.0

CMake 4.0 dropped support for projects with a minimum required version
below 3.5. libarchive, as well as possibly other dependencies, had older
versions set so they now fail to build.

GitHub Actions and MSYS2 were very quick to update their CMake version
and there isn't a tagged vcpkg release with a fix for libarchive yet, so
we will use a specific commit for now.
This commit is contained in:
Nadia Holmquist Pedersen 2025-04-09 16:40:57 +02:00
parent 0fcf1f6e3a
commit 9ed7e5803e
3 changed files with 5 additions and 4 deletions

View File

@ -4,13 +4,13 @@ on:
push:
branches:
- master
- ci/vcpkg-update
- ci/*
pull_request:
branches:
- master
env:
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
VCPKG_COMMIT: 2ad004460f5db4d3b66f62f5799ff66c265c4b5d
MELONDS_GIT_BRANCH: ${{ github.ref }}
MELONDS_GIT_HASH: ${{ github.sha }}
MELONDS_BUILD_PROVIDER: GitHub Actions

View File

@ -10,7 +10,7 @@ on:
- master
env:
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
VCPKG_COMMIT: 2ad004460f5db4d3b66f62f5799ff66c265c4b5d
MELONDS_GIT_BRANCH: ${{ github.ref }}
MELONDS_GIT_HASH: ${{ github.sha }}
MELONDS_BUILD_PROVIDER: GitHub Actions

View File

@ -9,7 +9,8 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
endif()
FetchContent_Declare(vcpkg
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
GIT_TAG 2025.01.13
GIT_TAG 2ad004460f5db4d3b66f62f5799ff66c265c4b5d
EXCLUDE_FROM_ALL
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
FetchContent_MakeAvailable(vcpkg)
endif()