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.

Sign up for GitHub

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 2025-01-11. #43209

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Update vcpkg-tool to 2025-01-11. #43209

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
358f389
Migrate tool metadata from XML to JSON format
vicroms Dec 17, 2024
d15d9e4
Update vcpkg-tool to 2025-01-11.
BillyONeal Jan 11, 2025
34a8920
Don't use parent hashes when the tool version changes.
BillyONeal Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
299 changes: 299 additions & 0 deletions scripts/vcpkg-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
{
"schema-version": 1,
"tools": [
{
"name": "python3",
"os": "windows",
"version": "3.12.7",
"executable": "python.exe",
"url": "https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-win32.zip",
"sha512": "15542080e0cc25c574391218107fe843006e8c5a7161d1cd48cf14a3c47155c0244587273d9c747f35b15ea17676869ecce079214824214c1a62abfc86ad9f9b",
"archive": "python-3.12.7-embed-win32.zip"
},
{
"name": "python3_with_venv",
"os": "windows",
"version": "3.12.7",
"executable": "tools/python.exe",
"url": "https://www.nuget.org/api/v2/package/python/3.12.7",
"sha512": "6d5cac329808e31d4d8d593da6eeaa9ea4ec0296679335e7b7811f6c6fa6cbb96948d2f7845071798c6f73f83852dd731dc2b0fda48c520b9bec8a86cc56134e",
"archive": "python-3.12.7.nupkg.zip"
},
{
"name": "cmake",
"os": "windows",
"arch": "amd64",
"version": "3.30.1",
"executable": "cmake-3.30.1-windows-i386/bin/cmake.exe",
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-i386.zip",
"sha512": "0b74bd4222064cfb6e42838987704eb21d57ad5f7bbd87714ab570f1d107fa19bd2f14316475338518292bc377bf38b581a07c73267a775cd385bbd1800879b4",
"archive": "cmake-3.30.1-windows-i386.zip"
},
{
"name": "cmake",
"os": "windows",
"arch": "arm64",
"version": "3.30.1",
"executable": "cmake-3.30.1-windows-arm64/bin/cmake.exe",
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip",
"sha512": "40bcdeff5ff40044629f49e0effc958a719353330ea39876b919fb7c2d441885c884acf43e644ab5dedcb95503d211c895da1c0b6360e71449bea6a981f8e128",
"archive": "cmake-3.30.1-windows-arm64.zip"
},
{
"name": "cmake",
"os": "osx",
"version": "3.30.1",
"executable": "cmake-3.30.1-macos-universal/CMake.app/Contents/bin/cmake",
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-macos-universal.tar.gz",
"sha512": "71290d3b5e51724711e8784f5b21100cb0cffdbb889da7572a26dd171d9052601496de8d39c42d76ef3a9245af2ab35a590bf53ad68d7bb8a2047b64272d2647",
"archive": "cmake-3.30.1-macos-universal.tar.gz"
},
{
"name": "cmake",
"os": "linux",
"arch": "arm64",
"version": "3.30.1",
"executable": "cmake-3.30.1-linux-aarch64/bin/cmake",
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-aarch64.tar.gz",
"sha512": "ec6c1c682dda2381aa5ebef98a2597e4ab6b4563639c28b2f30c20360694b902a7b33c175c796169a9f99ed139f053916042caed58d83298680894c2840dbb87",
"archive": "cmake-3.30.1-linux-aarch64.tar.gz"
},
{
"name": "cmake",
"os": "linux",
"version": "3.30.1",
"executable": "cmake-3.30.1-linux-x86_64/bin/cmake",
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz",
"sha512": "84ce1333ed696a1736986fba2853c5d8db0e4c9addaf4a4723911248c6d49ecf545adf8bd46091d198fc7bd1e6c896798661463aa1ce3a726a093883aaa19adf",
"archive": "cmake-3.30.1-linux-x86_64.tar.gz"
},
{
"name": "git",
"os": "windows",
"version": "2.7.4",
"executable": "mingw64/bin/git.exe",
"url": "https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/PortableGit-2.43.0-64-bit.7z.exe",
"sha512": "02ec40f55a6de18f305530e9415b6ce0a597359ebb9a58cf727ac84eceb0003b0f437941b76872b6568157a333c8e6e8d865a36faf874fd5f04774deb6a9387a",
"archive": "PortableGit-2.43.0-32-bit.7z.exe"
},
{
"name": "git",
"os": "linux",
"version": "2.7.4",
"executable": ""
},
{
"name": "git",
"os": "osx",
"version": "2.7.4",
"executable": ""
},
{
"name": "git",
"os": "freebsd",
"version": "2.7.4",
"executable": ""
},
{
"name": "gsutil",
"os": "windows",
"version": "4.65",
"executable": "google-cloud-sdk/bin/gsutil.cmd",
"url": "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip",
"sha512": "e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389",
"archive": "google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip"
},
{
"name": "gsutil",
"os": "osx",
"version": "4.65",
"executable": "gsutil/gsutil",
"url": "https://storage.googleapis.com/pub/gsutil_4.65.tar.gz",
"sha512": "2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8",
"archive": "gsutil_4.65.tar.gz"
},
{
"name": "gsutil",
"os": "linux",
"version": "4.65",
"executable": "gsutil/gsutil",
"url": "https://storage.googleapis.com/pub/gsutil_4.65.tar.gz",
"sha512": "2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8",
"archive": "gsutil_4.65.tar.gz"
},
{
"name": "vswhere",
"os": "windows",
"version": "3.1.7",
"executable": "vswhere.exe",
"url": "https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe",
"sha512": "40c534eb27f079c15c9782f53f82c12dabfede4d3d85f0edf8a855c2b0d5e12921a96506b37c210beab3c33220f8ff098447ad054e82d8c2603964975fc12076"
},
{
"name": "nuget",
"os": "windows",
"version": "6.10.0",
"executable": "nuget.exe",
"url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe",
"sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf"
},
{
"name": "nuget",
"os": "linux",
"version": "6.10.0",
"executable": "nuget.exe",
"url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe",
"sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf"
},
{
"name": "nuget",
"os": "osx",
"version": "6.10.0",
"executable": "nuget.exe",
"url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe",
"sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf"
},
{
"name": "coscli",
"os": "windows",
"version": "0.11.0",
"executable": "coscli-windows.exe",
"url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe",
"sha512": "38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06"
},
{
"name": "coscli",
"os": "linux",
"version": "0.11.0",
"executable": "coscli-linux",
"url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux",
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this also run on arm64?

Copy link
Member Author

Choose a reason for hiding this comment

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

No idea. Unfortunately this file has already been burned into the SHA the tool references so I'd prefer to make improvements like this as a subsequent change unless they are actively broken.

Copy link
Contributor

Choose a reason for hiding this comment

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

image Seems to be broken anyway

Copy link
Contributor

Choose a reason for hiding this comment

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

If I fix the hash I get
image
So maybe it is x64 only

Copy link
Member Author

Choose a reason for hiding this comment

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

It's the same SHA as was in the XML:

    <tool name="coscli" os="linux">
        <version>0.11.0</version>
        <exeRelativePath>coscli-linux</exeRelativePath>
        <url>https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux</url>
        <sha512>9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924</sha512>
    </tool>

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like there are arch-specific ones in current releases: https://github.com/tencentyun/coscli/releases/tag/v1.0.3

"sha512": "9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924"
},
{
"name": "coscli",
"os": "osx",
"version": "0.11.0",
"executable": "coscli-mac",
"url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac",
"sha512": "9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db"
},
{
"name": "installerbase",
"os": "windows",
"version": "4.4.0",
"executable": "QtInstallerFramework-win-x86/bin/installerbase.exe",
"url": "https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip",
"sha512": "fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947",
"archive": "installer-framework-opensource-src-4.4.0.zip"
},
{
"name": "7zip_msi",
"os": "windows",
"version": "24.08",
"executable": "Files/7-Zip/7z.exe",
"url": "https://github.com/ip7z/7zip/releases/download/24.08/7z2408-x64.msi",
"sha512": "3259bf5e251382333c9d18a3fc01d83491fb41bc4ac4ddb25a02918494594c1074482b6608189a8a89e343d78e34d57420cdeff1d7ace5acfdcaacc8776f1be8",
"archive": "7z2408-x64.msi"
},
{
"name": "7zip",
"os": "windows",
"version": "24.09",
"executable": "7z.exe",
"url": "https://github.com/ip7z/7zip/releases/download/24.09/7z2409.exe",
"sha512": "a39a84b13b383ac5fca20eb6d92ec6b8bc85f1b6a545c441efdbe054d8d12c9ebe97d366235bdf1383bbdb2a9666d18d0145b10b6e589180502c0c2dfa26ef14",
"archive": "7z2409.7z.exe"
},
{
"name": "7zr",
"os": "windows",
"version": "24.09",
"executable": "7zr.exe",
"url": "https://github.com/ip7z/7zip/releases/download/24.09/7zr.exe",
"sha512": "44d8504a693ad4d6b79631b653fc19b572de6bbe38713b53c45d9c9d5d3710aa8df93ee867a2a24419ebe883b8255fd18f30f8cf374b2242145fd6acb2189659"
},
{
"name": "aria2",
"os": "windows",
"version": "1.37.0",
"executable": "aria2-1.37.0-win-64bit-build1/aria2c.exe",
"url": "https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip",
"sha512": "6d78405da9cf5639dbe8174787002161b8124d73880fb57cc8c0a3a63982f84e46df4e626990c58f23452965ad925f0d37cb9147e99b25c3d7ca0ea49602f34d",
"archive": "aria2-1.37.0-win-64bit-build1.zip"
},
{
"name": "aria2",
"os": "osx",
"version": "1.35.0",
"executable": "aria2-1.35.0/bin/aria2c",
"url": "https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-osx-darwin.tar.bz2",
"sha512": "3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec",
"archive": "aria2-1.35.0-osx-darwin.tar.bz2"
},
{
"name": "ninja",
"os": "windows",
"arch": "x64",
"version": "1.11.1",
"executable": "ninja.exe",
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip",
"sha512": "a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199",
"archive": "ninja-win-1.11.1.zip"
},
{
"name": "ninja",
"os": "linux",
"arch": "x64",
"version": "1.11.1",
"executable": "ninja",
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip",
"sha512": "6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde",
"archive": "ninja-linux-1.11.1.zip"
},
{
"name": "ninja",
"os": "osx",
"version": "1.11.1",
"executable": "ninja",
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip",
"sha512": "dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427",
"archive": "ninja-mac-1.11.1.zip"
},
{
"name": "powershell-core",
"os": "windows",
"version": "7.2.24",
"executable": "pwsh.exe",
"url": "https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/PowerShell-7.2.24-win-x64.zip",
"sha512": "a08b72958f5a552240d3f68c581d8c8cb580468a71f5e55ca54a1dd0c0fcd81da9df11036653e2300fc4a5778a77c0147832ca06f7837f03417e9795e577a76f",
"archive": "PowerShell-7.2.24-win-x64.zip"
},
{
"name": "node",
"os": "windows",
"version": "16.15.1",
"executable": "node-v16.15.1-win-x64/node.exe",
"url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-win-x64.7z",
"sha512": "7ec4bfe2ea6034e1461e306b6372d62c0c5d1060c453ba76a73a5cec38ac26b5952a744caa9071455329caa58eb0a96d26c68854c8915c17610ff27b0cf2c1cf",
"archive": "node-v16.15.1-win-x64.7z"
},
{
"name": "node",
"os": "linux",
"version": "16.15.1",
"executable": "node-v16.15.1-linux-x64/bin/node",
"url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.gz",
Copy link
Contributor

Choose a reason for hiding this comment

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

x64 only

"sha512": "5ad3b4b9caeaa8d31503efa99f5a593118a267dec9d4181d019732126ba248ce9a901207115b3f6b899eb5b3f0373c7f77ea95cc92ac625cddf437ee9b8b8919",
"archive": "node-v16.15.1-linux-x64.tar.gz"
},
{
"name": "node",
"os": "osx",
"version": "16.15.1",
"executable": "node-v16.15.1-darwin-x64/bin/node",
"url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-darwin-x64.tar.gz",
"sha512": "90d0612bbe5467b6cf385c91a68b8daad0057e3e0ccacea44567f5b95b14f7481cb79784185ab1463b4bd990e092ff0f9109576d1a1934b84e1c816582929611",
"archive": "node-v16.15.1-darwin-x64.tar.gz"
}
]
}
Loading