Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vcpkg-tool to 2024-12-09. #42608

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Update vcpkg-tool to 2024-12-09. #42608

merged 2 commits into from
Dec 12, 2024

Conversation

JavierMatosD
Copy link
Contributor

@JavierMatosD JavierMatosD commented Dec 9, 2024

https://github.com/microsoft/vcpkg-tool/releases/tag/2024-12-09

Also uses vcpkg.exe to unpack 7z.exe archives.

This fixes a bug with vcpkg_find_acquire(CLANG) since we are currently downloading its archive as a 7z.exe even though it is not a 7z archive.

The following are additional meaningful tool changes:

Thank you contributors!

@JavierMatosD
Copy link
Contributor Author

vcpkg_find_acquire(7z) should give use the full 7zip as a.7z.exe, the tool should unpack that. ✅

vcpkg fetch 7zip should return full 7zip so we should be able to use 7zip for literally any unpacking. ✅ (We don't need 7zr for anything)

Problem:
vcpkg_find_acquire(CLANG) downloads as a .7z.exe -> triggers tool extraction -> 💣 (not a real 7z archive)

@JavierMatosD JavierMatosD force-pushed the 7z_extraction branch 2 times, most recently from 1e8a794 to d17e80c Compare December 9, 2024 20:04
@WangWeiLin-MV WangWeiLin-MV added the category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly label Dec 10, 2024
@BillyONeal BillyONeal changed the title vcpkg_extract_archive: Use vcpkg.exe z-extract Update vcpkg-tool to 2024-12-09. Dec 10, 2024
@BillyONeal
Copy link
Member

Note that this PR needs to be landed using administrative permissions as a MERGE, not a squash, as we need 0c4cf19 to be accessible 'forever' as it is burned into that matching tool release.

@BillyONeal
Copy link
Member

Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Marking 'request changes' so that we don't forget to merge rather than squash.

@BillyONeal
Copy link
Member

VS smoke test passed.

Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test with example ports intel-mkl and gmp, download files checked:

  • vcpkgTools.xml
    • {VCPKG_DOWNLOADS}/downloads/tools/7zr-24.09-windows/7zr.exe
    • {VCPKG_DOWNLOADS}/downloads/7z2409.7z.exe
    • {VCPKG_DOWNLOADS}/downloads/LLVM-15.0.6-win64.exe
  • win32_extract_self_extracting_7z
    • {VCPKG_DOWNLOADS}/downloads/7z2409.7z
  • extract_archive
    • {VCPKG_DOWNLOADS}/downloads/tools/7zip-24.09-windows/7z.exe
  • vcpkg_extract_archive.cmake
    • {VCPKG_DOWNLOADS}/downloads/tools/clang/clang-15.0.6/bin/clang.exe
    • {VCPKG_DOWNLOADS}/downloads/tools/7z/24.09/7z.exe

@WangWeiLin-MV WangWeiLin-MV added the info:reviewed Pull Request changes follow basic guidelines label Dec 12, 2024
@BillyONeal BillyONeal merged commit 47344ab into master Dec 12, 2024
32 checks passed
@BillyONeal BillyONeal deleted the 7z_extraction branch December 12, 2024 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants