Skip to content

Conversation

@akrieger
Copy link
Member

@akrieger akrieger commented Nov 20, 2023

Summary

Build "Update vcpkg commit & windows llvm build configuration"

Purpose of change

Fixes Windows builds failing in GH CI. vcpkg occasionally forces an update because it relies on external packages not under its control, which can be removed, which then break anyone using older commits of vcpkg. It's terrible.

People using the llvm / lld build integration with visual studio will need to update their vcpkg setup to this commit and rebuild their vcpkg deps, typically by deleting msvc-full-features/vcpkg_installed and rerunning the build in visual studio.

Describe the solution

Update to the vcpkg commit that specifically handles this case, microsoft/vcpkg#29067. And also for pkg-config we need microsoft/vcpkg#31924.

Describe alternatives you've considered

Not.

Testing

Windows CI should pass on this PR.

Additional context

@github-actions github-actions bot added Code: Build Issues regarding different builds and build environments <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs Code: Tooling Tooling that is not part of the main game but is part of the repo. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions and removed Code: Build Issues regarding different builds and build environments labels Nov 20, 2023
@akrieger
Copy link
Member Author

Huh. Not good enough. Alrighty then.

@github-actions github-actions bot added Code: Build Issues regarding different builds and build environments BasicBuildPassed This PR builds correctly, label assigned by github actions labels Nov 20, 2023
Packages were deprecated that core vcpkg functionality
relied on. Update vcpkg to a commit where they handle that.
@I-am-Erk I-am-Erk merged commit f7a39d3 into CleverRaven:master Nov 21, 2023
scarf005 added a commit to scarf005/Cataclysm-BN that referenced this pull request Nov 25, 2023
scarf005 added a commit to scarf005/Cataclysm-BN that referenced this pull request Nov 25, 2023
github-merge-queue bot pushed a commit to cataclysmbn/Cataclysm-BN that referenced this pull request Nov 25, 2023
ci: bump vcpkg commit version

see: CleverRaven/Cataclysm-DDA#69592

Co-authored-by: Andrew Krieger <[email protected]>
@akrieger akrieger deleted the vcpkg_jonx branch November 27, 2023 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. <Documentation> Design documents, internal info, guides and help. json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants