From d58cdf65cd53f7ef4324e524b822184a167f8573 Mon Sep 17 00:00:00 2001 From: James Sharpe Date: Thu, 8 Aug 2024 10:51:41 +0100 Subject: [PATCH] Upgrade default ninja version to 1.12.1 (#1248) --- MODULE.bazel | 4 ++-- foreign_cc/extensions.bzl | 2 +- foreign_cc/repositories.bzl | 2 +- toolchains/built_toolchains.bzl | 13 +++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 2b9a0b17..b9da6314 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -30,7 +30,7 @@ use_repo( "glib_src", "gnumake_src", "meson_src", - "ninja_1.12.0_toolchains", + "ninja_1.12.1_toolchains", "ninja_build_src", "pkgconfig_src", "rules_foreign_cc_framework_toolchains", @@ -39,7 +39,7 @@ use_repo( register_toolchains( "@rules_foreign_cc_framework_toolchains//:all", "@cmake_3.23.2_toolchains//:all", - "@ninja_1.12.0_toolchains//:all", + "@ninja_1.12.1_toolchains//:all", "@python_3_9//:all", "@rules_foreign_cc//toolchains:all", ) diff --git a/foreign_cc/extensions.bzl b/foreign_cc/extensions.bzl index ca239241..f195d3af 100644 --- a/foreign_cc/extensions.bzl +++ b/foreign_cc/extensions.bzl @@ -4,7 +4,7 @@ load("//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") load("//toolchains:prebuilt_toolchains.bzl", "prebuilt_toolchains") _DEFAULT_CMAKE_VERSION = "3.23.2" -_DEFAULT_NINJA_VERSION = "1.12.0" +_DEFAULT_NINJA_VERSION = "1.12.1" cmake_toolchain_version = tag_class(attrs = { "version": attr.string(doc = "The cmake version", default = _DEFAULT_CMAKE_VERSION), diff --git a/foreign_cc/repositories.bzl b/foreign_cc/repositories.bzl index 3350993a..b62df75a 100644 --- a/foreign_cc/repositories.bzl +++ b/foreign_cc/repositories.bzl @@ -11,7 +11,7 @@ def rules_foreign_cc_dependencies( register_default_tools = True, cmake_version = "3.23.2", make_version = "4.4.1", - ninja_version = "1.12.0", + ninja_version = "1.12.1", meson_version = "1.1.1", pkgconfig_version = "0.29.2", register_preinstalled_tools = True, diff --git a/toolchains/built_toolchains.bzl b/toolchains/built_toolchains.bzl index a7d0c5f5..8889b6ea 100644 --- a/toolchains/built_toolchains.bzl +++ b/toolchains/built_toolchains.bzl @@ -135,6 +135,19 @@ def _ninja_toolchain(version, register_toolchains): native.register_toolchains( "@rules_foreign_cc//toolchains:built_ninja_toolchain", ) + if version == "1.12.1": + maybe( + http_archive, + name = "ninja_build_src", + build_file_content = _ALL_CONTENT, + integrity = "sha256-ghvf9Io/aDvEuztvC1/nstZHz2XVKutjMoyRpsbfKFo=", + strip_prefix = "ninja-1.12.1", + urls = [ + "https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.12.1.tar.gz", + "https://github.com/ninja-build/ninja/archive/v1.12.1.tar.gz", + ], + ) + return if version == "1.12.0": maybe( http_archive,