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.
This commit is contained in:
scawful
2025-09-28 17:55:12 -04:00
parent 694a246103
commit fa6f2a231a
2 changed files with 2 additions and 2 deletions

View File

@@ -172,7 +172,6 @@ jobs:
continue-on-error: true continue-on-error: true
timeout-minutes: 10 timeout-minutes: 10
with: with:
vcpkgGitCommitId: '2024.09.12'
runVcpkgInstall: true runVcpkgInstall: true
vcpkgJsonGlob: '**/vcpkg.json' vcpkgJsonGlob: '**/vcpkg.json'
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
@@ -184,6 +183,8 @@ jobs:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg VCPKG_ROOT: ${{ github.workspace }}/vcpkg
VCPKG_USE_SYSTEM_BINARIES: 1 VCPKG_USE_SYSTEM_BINARIES: 1
VCPKG_DOWNLOADS: ${{ github.workspace }}/vcpkg_downloads VCPKG_DOWNLOADS: ${{ github.workspace }}/vcpkg_downloads
VCPKG_DEFAULT_HOST_TRIPLET: x64-windows
VCPKG_FEATURE_FLAGS: versions
# Set vcpkg availability flag when vcpkg succeeds # Set vcpkg availability flag when vcpkg succeeds
- name: Set vcpkg availability flag - name: Set vcpkg availability flag

View File

@@ -9,7 +9,6 @@
"features": ["vulkan"] "features": ["vulkan"]
} }
], ],
"builtin-baseline": "2024.09.12",
"overrides": [], "overrides": [],
"features": { "features": {
"pkg-config": { "pkg-config": {