Skip to content

Commit e8265df

Browse files
vcpkg 2025.01.13, update nixpkgs
1 parent 15c3faa commit e8265df

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/build-macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- master
1111

1212
env:
13+
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
1314
MELONDS_GIT_BRANCH: ${{ github.ref }}
1415
MELONDS_GIT_HASH: ${{ github.sha }}
1516
MELONDS_BUILD_PROVIDER: GitHub Actions
@@ -34,7 +35,7 @@ jobs:
3435
- name: Set up vcpkg
3536
uses: lukka/run-vcpkg@v11
3637
with:
37-
vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c
38+
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
3839
- name: Build
3940
uses: lukka/run-cmake@v10
4041
with:

.github/workflows/build-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- master
1111

1212
env:
13+
VCPKG_COMMIT: 6f29f12e82a8293156836ad81cc9bf5af41fe836
1314
MELONDS_GIT_BRANCH: ${{ github.ref }}
1415
MELONDS_GIT_HASH: ${{ github.sha }}
1516
MELONDS_BUILD_PROVIDER: GitHub Actions
@@ -33,7 +34,7 @@ jobs:
3334
- name: Set up vcpkg
3435
uses: lukka/run-vcpkg@v11
3536
with:
36-
vcpkgGitCommitId: b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c
37+
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
3738
- name: Configure
3839
run: cmake --preset=release-mingw-x86_64 -DMELONDS_EMBED_BUILD_INFO=ON
3940
- name: Build

cmake/ConfigureVcpkg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
99
endif()
1010
FetchContent_Declare(vcpkg
1111
GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
12-
GIT_TAG 2024.11.16
12+
GIT_TAG 2025.01.13
1313
SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
1414
FetchContent_MakeAvailable(vcpkg)
1515
endif()

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)