Bump vcpkg to 2026.05.25#6179
Merged
Merged
Conversation
…lure The vcpkg install step runs inside Docker via retry.sh, and the underlying meson/ninja error messages live in /root/vcpkg/buildtrees/<port>/*-out.log, which are not surfaced in the GitHub Actions log when the build fails. Tail those files on final failure so CI logs show the actual cause.
Previous dump iterated every port alphabetically and was clipped by
Docker buildx at the 2 MiB log limit before reaching the failing
port's logs. Instead:
- print /root/vcpkg/installed/vcpkg/issue_body.md, vcpkg's
auto-generated failure report for the failing port (usually
contains the relevant log excerpt inline);
- only dump the 8 most-recently-modified *-out.log / *-err.log
files, which are always the failing port's.
This reverts commit aff18c0.
…tall failure" This reverts commit 7709ec1.
Signed-off-by: Artur Sharafutdinov <artur.sharafutdinov@meshinspector.com>
…5.25 # Conflicts: # .github/workflows/pip-build.yml
Derive VCPKG_TAG from the checked-out vcpkg release tag (e.g. 2026.05.25) via `git describe --exact-match` instead of the vcpkg-tool version date (2026-04-08), so the S3 binary-cache folder tracks the registry release we bump. CI checks vcpkg out at the release tag before running install.bat on both the producer (prepare-images) and consumer (build) sides, keeping them in sync. Falls back to the tool version date when vcpkg isn't on a tagged commit. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updates the vcpkg tag from
2026.04.27to2026.05.25across CI workflows, docker files, requirements, and the C++ setup guide.Additional dependency adjustments needed to build cleanly against the new tag:
dbus→dbus[core], dropping thelibsystemddependency.opencascade→opencascade-minimal, a STEP-import-only build of OCCT (drops Visualization, OCAF/ApplicationFramework, DataExchange/Draw extras, and the freetype/freeimage/vtk/opengl integrations).vcpkg S3 binary-cache folder now tracks the release tag
thirdparty/install.batnow derives the S3 cache folder (VCPKG_TAG) from the checked-out vcpkg release tag viagit describe --exact-match, instead of the vcpkg-tool version date reported byvcpkg version.Previously the folder was the tool version (e.g.
s3://vcpkg-export/2026-04-08/...). Because the2026.04.27and2026.05.25registry releases both bundle the same2026-04-08tool, bumping the tag did not change the cache folder. The folder now matches the release we bump:s3://vcpkg-export/2026-04-08/<triplet>/s3://vcpkg-export/2026.05.25/<triplet>/(vs2019 triplets →2024.10.21)Both the producer (
prepare-images) and the consumer (setup-vcpkg-windows) check vcpkg out at the release tag before runninginstall.bat, so they stay in sync automatically. The old tool-version derivation remains as a fallback when vcpkg isn't on a tagged commit.Trade-offs:
Impact of
opencascade-minimalon WindowsMeasured on the
windows-2022/vs2022runners, fresh cache-miss builds:C:\vcpkgtree, all deps)x64-windows-meshlib) and same vcpkg tag (2026.05.25), so the delta is purely the OCCT port swap — smaller libraries plus dropped transitive deps. This means smaller cache restores and less pressure against the 10 GB Actions cache cap.tbb/eigen), so the win is footprint, not compile time.Note: the build-time rows come from separate cache-miss runs with slightly different OCCT versions/triplets, so treat them as approximate; the cache-size rows are a controlled same-triplet/same-tag comparison.