From a4a1fd5fb6ee5de876d8dae7d38884a51f4591c7 Mon Sep 17 00:00:00 2001 From: scawful Date: Wed, 15 Oct 2025 22:58:08 -0400 Subject: [PATCH] chore(vcpkg): update baseline and dependencies for vcpkg configuration - Updated the vcpkg baseline and commit ID across configuration files to the latest version for improved compatibility. - Added SDL2 as a dependency in `vcpkg.json` for Windows platform support. - Adjusted CI and release workflows to reflect the new vcpkg commit ID, ensuring consistency in the build process. Benefits: - Ensures the project utilizes the latest features and fixes from vcpkg, enhancing overall stability and reliability. - Streamlines the integration of SDL2, improving support for Windows builds. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- vcpkg-configuration.json | 2 +- vcpkg.json | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3d51a48..d839fb30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' with: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' # 2025.01.20 release + vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509' # 2025.01.20 release runVcpkgInstall: false # Let CMake handle installation via manifest mode - name: Retry vcpkg setup (Windows) @@ -91,7 +91,7 @@ jobs: VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' with: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' + vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509' runVcpkgInstall: false - name: Resolve vcpkg toolchain (Windows) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f00f6a3..f5057e28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: uses: lukka/run-vcpkg@v11 with: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: '7ba0ba7334c3346e7eee1e049ba85da193a8d821' + vcpkgGitCommitId: 'b2c74683ecfd6a8e7d27ffb0df077f66a9339509' runVcpkgInstall: false env: VCPKG_DEFAULT_TRIPLET: x64-windows-static diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index e4536da7..6e358493 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -3,7 +3,7 @@ "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg", - "baseline": "7ba0ba7334c3346e7eee1e049ba85da193a8d821" + "baseline": "b2c74683ecfd6a8e7d27ffb0df077f66a9339509" }, "registries": [] } diff --git a/vcpkg.json b/vcpkg.json index ce1c8cfb..d36b5a63 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,8 +3,12 @@ "name": "yaze", "version": "0.3.2", "description": "Yet Another Zelda3 Editor", - "builtin-baseline": "7ba0ba7334c3346e7eee1e049ba85da193a8d821", + "builtin-baseline": "b2c74683ecfd6a8e7d27ffb0df077f66a9339509", "dependencies": [ + { + "name": "sdl2", + "platform": "windows" + }, { "name": "yaml-cpp", "platform": "windows"