From 694a24610312c1fb7aeb4626ee677980c0cb9ad9 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 28 Sep 2025 17:49:07 -0400 Subject: [PATCH] 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. --- .github/workflows/release.yml | 5 ++++- vcpkg.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 87c46e0b..7e7210b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -170,8 +170,9 @@ jobs: if: runner.os == 'Windows' uses: lukka/run-vcpkg@v11 continue-on-error: true + timeout-minutes: 10 with: - vcpkgGitCommitId: 'c8696863d371ab7f46e213d8f5ca923c4aef2a00' + vcpkgGitCommitId: '2024.09.12' runVcpkgInstall: true vcpkgJsonGlob: '**/vcpkg.json' vcpkgDirectory: '${{ github.workspace }}/vcpkg' @@ -181,6 +182,8 @@ jobs: VCPKG_DISABLE_METRICS: 1 VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_ROOT: ${{ github.workspace }}/vcpkg + VCPKG_USE_SYSTEM_BINARIES: 1 + VCPKG_DOWNLOADS: ${{ github.workspace }}/vcpkg_downloads # Set vcpkg availability flag when vcpkg succeeds - name: Set vcpkg availability flag diff --git a/vcpkg.json b/vcpkg.json index e1e4b717..cd6a48a9 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,7 +9,7 @@ "features": ["vulkan"] } ], - "builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00", + "builtin-baseline": "2024.09.12", "overrides": [], "features": { "pkg-config": {