From fa6f2a231ad85ec955f355fc8aee8240dad33a8c Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 17:55:12 -0400 Subject: [PATCH] Update vcpkg configuration and GitHub Actions workflow - Removed the `builtin-baseline` entry from `vcpkg.json`, streamlining the configuration. - Updated the GitHub Actions workflow to remove the hardcoded `vcpkgGitCommitId`, enhancing flexibility. - Added `VCPKG_DEFAULT_HOST_TRIPLET` and `VCPKG_FEATURE_FLAGS` to improve build configuration options. --- .github/workflows/release.yml | 3 ++- vcpkg.json | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e7210b5..11d828c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -172,7 +172,6 @@ jobs: continue-on-error: true timeout-minutes: 10 with: - vcpkgGitCommitId: '2024.09.12' runVcpkgInstall: true vcpkgJsonGlob: '**/vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/vcpkg' @@ -184,6 +183,8 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg VCPKG_USE_SYSTEM_BINARIES: 1 VCPKG_DOWNLOADS: ${{ github.workspace }}/vcpkg_downloads + VCPKG_DEFAULT_HOST_TRIPLET: x64-windows + VCPKG_FEATURE_FLAGS: versions # Set vcpkg availability flag when vcpkg succeeds - name: Set vcpkg availability flag diff --git a/vcpkg.json b/vcpkg.json index cd6a48a9..b828cf79 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,6 @@ "features": ["vulkan"] } ], - "builtin-baseline": "2024.09.12", "overrides": [], "features": { "pkg-config": {