diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 90328b91..cd25e40c 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -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 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 1faa8121..92d45d4d 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 diff --git a/cmake/ConfigureVcpkg.cmake b/cmake/ConfigureVcpkg.cmake index 11d9ebda..151e2989 100644 --- a/cmake/ConfigureVcpkg.cmake +++ b/cmake/ConfigureVcpkg.cmake @@ -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()