Update vcpkg configuration to use new baseline and improve GitHub Actions workflow

- Changed the `builtin-baseline` in `vcpkg.json` to the latest version `2024.09.12`, ensuring compatibility with updated dependencies.
- Updated the GitHub Actions workflow to reflect the new baseline, enhancing the reliability of the build process.
- Added a timeout for the vcpkg job and enabled the use of system binaries, improving the efficiency of the workflow.
This commit is contained in:
scawful
2025-09-28 17:49:07 -04:00
parent 43f4e97c7d
commit 694a246103
2 changed files with 5 additions and 2 deletions

View File

@@ -170,8 +170,9 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
continue-on-error: true continue-on-error: true
timeout-minutes: 10
with: with:
vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00' vcpkgGitCommitId: '2024.09.12'
runVcpkgInstall: true runVcpkgInstall: true
vcpkgJsonGlob: '**/vcpkg.json' vcpkgJsonGlob: '**/vcpkg.json'
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/vcpkg'
@@ -181,6 +182,8 @@ jobs:
VCPKG_DISABLE_METRICS: 1 VCPKG_DISABLE_METRICS: 1
VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
VCPKG_ROOT: ${{ github.workspace }}/vcpkg VCPKG_ROOT: ${{ github.workspace }}/vcpkg
VCPKG_USE_SYSTEM_BINARIES: 1
VCPKG_DOWNLOADS: ${{ github.workspace }}/vcpkg_downloads
# 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,7 @@
"features": ["vulkan"] "features": ["vulkan"]
} }
], ],
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00", "builtin-baseline": "2024.09.12",
"overrides": [], "overrides": [],
"features": { "features": {
"pkg-config": { "pkg-config": {