Skip to content

Conversation

@BillyONeal
Copy link
Member

@BillyONeal BillyONeal commented Dec 3, 2025

  • Update the scripts SHA to that for 2025-12-03
  • That broke several tests due to the change in Ninja version
  • In order to fix that I updated the tests to ensure we were not triggering cross compilation unless we were actually intending to do that; for example we were selecting x64-osx even though arm64-osx is the 'normal' osx now.
  • That change in expected triplet itself broke a lot of tests resulting in most of the edits here.
  • Updating macOS and Ubuntu runners to 26/24.04 the stock GitHub Actions runners don't include a mono installation for the NuGet tests, so getting that on the boxes before running the e2e tests is done here.

In general the most impactful change is that we usually need to make a triplet with our expected changes on the fly rather than trying to make checked in test triplets. In particular detecting whether we are on arm64 is difficult because CMAKE_HOST_SYSTEM_PROCESSOR is not set before project() (as is normally the case in a triplet)

@BillyONeal BillyONeal enabled auto-merge (squash) December 3, 2025 21:27
@BillyONeal BillyONeal changed the title Update scripts SHA 2025-12-03. Update scripts SHA 2025-12-03 and update github actions runners. Dec 3, 2025
@BillyONeal BillyONeal disabled auto-merge December 4, 2025 22:29
@BillyONeal BillyONeal merged commit d84fb80 into microsoft:main Dec 5, 2025
7 checks passed
@BillyONeal BillyONeal deleted the update-scripts-sha-2025-12-03 branch December 5, 2025 00:23
BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Dec 5, 2025
https://github.com/microsoft/vcpkg-tool/releases/tag/2025-12-05

* Bump js-yaml from 4.1.0 to 4.1.1 in /vcpkg-artifacts by @dependabot[bot] in microsoft/vcpkg-tool#1847
* Bump glob from 10.4.5 to 10.5.0 in /vcpkg-artifacts by @dependabot[bot] in microsoft/vcpkg-tool#1857
* Test parent hashes without actual build by @dg0yt in microsoft/vcpkg-tool#1870
* Fix qualified PackageSpec parse hang. by @BillyONeal in microsoft/vcpkg-tool#1872
* Test --skip-failures and fix "static" cascade by @dg0yt in microsoft/vcpkg-tool#1871
* Update scripts SHA 2025-12-03 and update github actions runners. by @BillyONeal in microsoft/vcpkg-tool#1873

Thanks for the `ci` improvements @dg0yt !
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants