test: A/B test cargo-vcpkg vs manual vcpkg with 2025.10.17

Adds cargo-vcpkg step alongside manual vcpkg for macOS to determine if
the fix is due to using manual vcpkg or simply upgrading to vcpkg
2025.10.17. Both methods will run to compare behavior.

- Updated vcpkg baseline from 2024.11.16 to 2025.10.17
- Restored macOS triplets in Cargo.toml
- Added duplicate cargo-vcpkg step for macOS builds
This commit is contained in:
Ryan Walters
2025-11-02 11:52:39 -06:00
parent aeb03aaf52
commit 07e0709c50
2 changed files with 11 additions and 2 deletions

View File

@@ -75,7 +75,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y libltdl-dev
- name: Setup vcpkg (macOS)
- name: Setup vcpkg (macOS - Manual)
if: runner.os == 'macOS'
run: |
# Clone vcpkg at latest stable release
@@ -99,6 +99,13 @@ jobs:
# Set VCPKG_ROOT for rust-sdl2 to find it
echo "VCPKG_ROOT=${{ github.workspace }}/vcpkg" >> $GITHUB_ENV
- name: Setup vcpkg (macOS - cargo-vcpkg A/B Test)
if: runner.os == 'macOS'
run: |
cargo install cargo-vcpkg
cargo vcpkg -v build
working-directory: pacman
- name: Vcpkg (Non-macOS)
if: runner.os != 'macOS'
run: |

View File

@@ -78,11 +78,13 @@ ignored = ["phf"]
[package.metadata.vcpkg]
dependencies = ["sdl2", "sdl2-image", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"]
git = "https://github.com/microsoft/vcpkg"
rev = "2024.11.16" # to check for a new one, check https://github.com/microsoft/vcpkg/releases
rev = "2025.10.17" # to check for a new one, check https://github.com/microsoft/vcpkg/releases
[package.metadata.vcpkg.target]
x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md" }
x86_64-unknown-linux-gnu = { triplet = "x64-linux" }
x86_64-apple-darwin = { triplet = "x64-osx" }
aarch64-apple-darwin = { triplet = "arm64-osx" }
[features]
# Windows-specific features