update vcpkg and nixpkgs

melonDS-emu · Sep 6, 2024 · 277b151 · 277b151
1 parent 4f6498c
commit 277b151
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up vcpkg
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
+          vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
       - name: Build
         uses: lukka/run-cmake@v10
         with:

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - ci/vcpkg-update
+      - ci/*
   pull_request:
     branches:
       - master
@@ -27,7 +27,7 @@ jobs:
     - name: Set up vcpkg
       uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 1de2026f28ead93ff1773e6e680387643e914ea1
+        vcpkgGitCommitId: 3508985146f1b1d248c67ead13f8f54be5b4f5da
     - name: Configure
       run: cmake --preset=release-mingw-x86_64
     - name: Build

diff --git a/cmake/ConfigureVcpkg.cmake b/cmake/ConfigureVcpkg.cmake
@@ -9,7 +9,7 @@ if (VCPKG_ROOT STREQUAL "${_DEFAULT_VCPKG_ROOT}")
     endif()
     FetchContent_Declare(vcpkg
         GIT_REPOSITORY "https://github.com/Microsoft/vcpkg.git"
-        GIT_TAG 2024.07.12
+        GIT_TAG 2024.08.23
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/vcpkg")
     FetchContent_MakeAvailable(vcpkg)
 endif()

diff --git a/flake.lock b/flake.lock