From c6935bce7513fa878944c03cd72473b298fab53e Mon Sep 17 00:00:00 2001 From: SunBlack Date: Mon, 13 Oct 2025 20:52:22 +0200 Subject: [PATCH] [vcpkg script] Update ninja to 1.13.1 (#46971) --- .../vcpkg_find_acquire_program(NINJA).cmake | 12 +++--- scripts/vcpkg-tools.json | 40 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index 31656a7db2..71c899a640 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -1,5 +1,5 @@ set(program_name ninja) -set(program_version 1.12.1) +set(program_version 1.13.1) set(version_command --version) if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) @@ -11,19 +11,19 @@ if(CMAKE_HOST_WIN32) set(download_filename "ninja-winarm64-${program_version}.zip") set(tool_subdirectory "${program_version}-windows-arm64") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip") - set(download_sha512 b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b) + set(download_sha512 6a3873522b3397a4d68c6a6c3e389085b81ba5ff20d4f5c289b3974c8bf7169de9cf2c8d9482c2b06846783492620008f486db44c2c651f007b3c335022a472d) else() set(download_filename "ninja-win-${program_version}.zip") set(tool_subdirectory "${program_version}-windows") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") - set(download_sha512 d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f) + set(download_sha512 44955ef9e0053036dc316de3693523ce280338c816b445c27fcbe7dd219543b815812662c9082c409b17d823284506faa5b5c3c5f6d3721242dfc73e56d4ec34) endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(download_filename "ninja-mac-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") set(tool_subdirectory "${program_version}-osx") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") - set(download_sha512 4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351) + set(download_sha512 72ce74b57d21bcd50c1d457a304a3f4f88d960631a945f754180153a7e747950bc2e34195d0490d2c298bba2c02f96d5a5925b4096ddb7c86b67d35f7579641f) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") set(version_command "") @@ -34,13 +34,13 @@ else() set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") set(tool_subdirectory "${program_version}-linux") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014) + set(download_sha512 ca4e424c46c12f4e120ab2030edcff8e34cf5db9d05b4364f2d4be10f46e1a29eef64f7b4bf65fb33cd629b3bc3bcb9292341f92953968ef226f44b52959d916) elseif(HOST_ARCH MATCHES "arm64|aarch64|ARM64|AARCH64") set(download_filename "ninja-linux-aarch64-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux-aarch64.zip") set(tool_subdirectory "${program_version}-linux-aarch64") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux-aarch64") - set(download_sha512 22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334) + set(download_sha512 7cd841409fd2a4f35566ab2f0add75d89d94cfaa5952bc550cf263878469ab8109e36553b66e6422018012a4e9af4c7eaf79c84af1733d061231ce3511e3c98e) else() set(version_command "") # somewhat hacky way to skip version check and use system binary endif() diff --git a/scripts/vcpkg-tools.json b/scripts/vcpkg-tools.json index f31e7699cd..ab1afeed69 100644 --- a/scripts/vcpkg-tools.json +++ b/scripts/vcpkg-tools.json @@ -249,50 +249,50 @@ "name": "ninja", "os": "windows", "arch": "arm64", - "version": "1.12.1", + "version": "1.13.1", "executable": "ninja.exe", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-winarm64.zip", - "sha512": "b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b", - "archive": "ninja-winarm64-1.12.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-winarm64.zip", + "sha512": "6a3873522b3397a4d68c6a6c3e389085b81ba5ff20d4f5c289b3974c8bf7169de9cf2c8d9482c2b06846783492620008f486db44c2c651f007b3c335022a472d", + "archive": "ninja-winarm64-1.13.1.zip" }, { "name": "ninja", "os": "windows", "arch": "x64", - "version": "1.12.1", + "version": "1.13.1", "executable": "ninja.exe", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip", - "sha512": "d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f", - "archive": "ninja-win-1.12.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-win.zip", + "sha512": "44955ef9e0053036dc316de3693523ce280338c816b445c27fcbe7dd219543b815812662c9082c409b17d823284506faa5b5c3c5f6d3721242dfc73e56d4ec34", + "archive": "ninja-win-1.13.1.zip" }, { "name": "ninja", "os": "linux", "arch": "arm64", - "version": "1.12.1", + "version": "1.13.1", "executable": "ninja", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux-aarch64.zip", - "sha512": "22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334", - "archive": "ninja-linux-aarch64-1.12.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux-aarch64.zip", + "sha512": "7cd841409fd2a4f35566ab2f0add75d89d94cfaa5952bc550cf263878469ab8109e36553b66e6422018012a4e9af4c7eaf79c84af1733d061231ce3511e3c98e", + "archive": "ninja-linux-aarch64-1.13.1.zip" }, { "name": "ninja", "os": "linux", "arch": "x64", - "version": "1.12.1", + "version": "1.13.1", "executable": "ninja", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip", - "sha512": "9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014", - "archive": "ninja-linux-1.12.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-linux.zip", + "sha512": "ca4e424c46c12f4e120ab2030edcff8e34cf5db9d05b4364f2d4be10f46e1a29eef64f7b4bf65fb33cd629b3bc3bcb9292341f92953968ef226f44b52959d916", + "archive": "ninja-linux-1.13.1.zip" }, { "name": "ninja", "os": "osx", - "version": "1.12.1", + "version": "1.13.1", "executable": "ninja", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip", - "sha512": "4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351", - "archive": "ninja-mac-1.12.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-mac.zip", + "sha512": "72ce74b57d21bcd50c1d457a304a3f4f88d960631a945f754180153a7e747950bc2e34195d0490d2c298bba2c02f96d5a5925b4096ddb7c86b67d35f7579641f", + "archive": "ninja-mac-1.13.1.zip" }, { "name": "powershell-core",