From 9c778439f68e6317e79a46a07b8c501bc24d8326 Mon Sep 17 00:00:00 2001 From: Pawel Rutka Date: Tue, 8 Sep 2026 08:48:09 +0000 Subject: [PATCH] Bump to newest mains --- .../score_modules_target_sw.MODULE.bazel | 12 +++---- .../score_modules_tooling.MODULE.bazel | 2 +- known_good.json | 16 +++++----- ...003-score-tooling-not-dev-dependency.patch | 7 +++-- ...-remove-hedron-and-clang-tidy-config.patch | 31 ++----------------- ...6-include-cpp-style-guide-in-toctree.patch | 9 ++---- .../007-lower-quick-start-heading.patch | 7 ----- ...008-rename-module-architecture-label.patch | 6 ---- 8 files changed, 23 insertions(+), 67 deletions(-) delete mode 100644 patches/baselibs/007-lower-quick-start-heading.patch delete mode 100644 patches/baselibs/008-rename-module-architecture-label.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 486b0773881..99cb294f050 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep(name = "score_baselibs") git_override( module_name = "score_baselibs", - commit = "33aad37ad3d12591b0d662ee37e430eedb1c273c", + commit = "c44eca5a9e35acb47287291a877a09b8d6e903ba", patch_strip = 1, patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", @@ -26,8 +26,6 @@ git_override( "//patches/baselibs:004-remove-hedron-and-clang-tidy-config.patch", "//patches/baselibs:005-rename-manual-verification-report-id.patch", "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch", - "//patches/baselibs:007-lower-quick-start-heading.patch", - "//patches/baselibs:008-rename-module-architecture-label.patch", ], remote = "https://github.com/eclipse-score/baselibs.git", ) @@ -35,7 +33,7 @@ git_override( bazel_dep(name = "score_communication") git_override( module_name = "score_communication", - commit = "b22ed6d314313c87eb06ca916efda9a71ec53cc6", + commit = "313f1178628189d267c8cd0d75971bdac04c20ee", patch_strip = 1, patches = [ "//patches/communication:001-expose-comm-examples.patch", @@ -75,21 +73,21 @@ git_override( bazel_dep(name = "score_lifecycle") git_override( module_name = "score_lifecycle", - commit = "432c85d91db8bd72a39a61f245eaf119a570b88d", + commit = "85da2168328d17a3cf53791ebf93534e5ed921fc", remote = "https://github.com/eclipse-score/lifecycle.git", ) bazel_dep(name = "score_logging") git_override( module_name = "score_logging", - commit = "052c9ea64f89dc816a5d2bba5203be013ea07d5b", + commit = "c8e85fd862d3cd281d263a87b3dcc3d59f8fa1a5", remote = "https://github.com/eclipse-score/logging.git", ) bazel_dep(name = "score_time") git_override( module_name = "score_time", - commit = "c4f0194a3b496757e5c193ed8618fc3f45a868a5", + commit = "310c9b63bc21fdc85df840fb8ee400a610667038", remote = "https://github.com/eclipse-score/time.git", ) diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index a87b6fb01dd..34849e93c12 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -67,7 +67,7 @@ git_override( bazel_dep(name = "score_docs_as_code") git_override( module_name = "score_docs_as_code", - commit = "f9d8aff0d113786b8707c10e72e36dbf47ffc25a", + commit = "a7edbc55c5b4ea35e9ef0c7554f961bc583021a4", remote = "https://github.com/eclipse-score/docs-as-code.git", ) diff --git a/known_good.json b/known_good.json index 37854499f44..acff8bc7360 100644 --- a/known_good.json +++ b/known_good.json @@ -9,9 +9,7 @@ "//patches/baselibs:003-score-tooling-not-dev-dependency.patch", "//patches/baselibs:004-remove-hedron-and-clang-tidy-config.patch", "//patches/baselibs:005-rename-manual-verification-report-id.patch", - "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch", - "//patches/baselibs:007-lower-quick-start-heading.patch", - "//patches/baselibs:008-rename-module-architecture-label.patch" + "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch" ], "metadata": { "code_root_path": "//score/...", @@ -29,12 +27,12 @@ "cpp" ] }, - "hash": "33aad37ad3d12591b0d662ee37e430eedb1c273c" + "hash": "c44eca5a9e35acb47287291a877a09b8d6e903ba" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", "docs": false, - "hash": "b22ed6d314313c87eb06ca916efda9a71ec53cc6", + "hash": "313f1178628189d267c8cd0d75971bdac04c20ee", "bazel_patches": [ "//patches/communication:001-expose-comm-examples.patch", "//patches/communication:003-module-deps-visibility.patch", @@ -118,7 +116,7 @@ "//score/health_monitor/src/rust:miri_tests" ] }, - "hash": "432c85d91db8bd72a39a61f245eaf119a570b88d" + "hash": "85da2168328d17a3cf53791ebf93534e5ed921fc" }, "score_logging": { "repo": "https://github.com/eclipse-score/logging.git", @@ -135,12 +133,12 @@ "//score/mw/log/legacy_non_verbose_api:unit_test" ] }, - "hash": "052c9ea64f89dc816a5d2bba5203be013ea07d5b" + "hash": "c8e85fd862d3cd281d263a87b3dcc3d59f8fa1a5" }, "score_time": { "repo": "https://github.com/eclipse-score/time.git", "docs": false, - "hash": "c4f0194a3b496757e5c193ed8618fc3f45a868a5", + "hash": "310c9b63bc21fdc85df840fb8ee400a610667038", "bazel_patches": [], "metadata": { "code_root_path": "//score/...", @@ -219,7 +217,7 @@ }, "score_docs_as_code": { "repo": "https://github.com/eclipse-score/docs-as-code.git", - "hash": "f9d8aff0d113786b8707c10e72e36dbf47ffc25a" + "hash": "a7edbc55c5b4ea35e9ef0c7554f961bc583021a4" }, "score_process_description": { "repo": "https://github.com/eclipse-score/process_description.git", diff --git a/patches/baselibs/003-score-tooling-not-dev-dependency.patch b/patches/baselibs/003-score-tooling-not-dev-dependency.patch index 82a6380357c..2b5d8048b08 100644 --- a/patches/baselibs/003-score-tooling-not-dev-dependency.patch +++ b/patches/baselibs/003-score-tooling-not-dev-dependency.patch @@ -1,12 +1,13 @@ diff --git a/MODULE.bazel b/MODULE.bazel +index fe305dfd2..bf357f89a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -102,7 +102,7 @@ bazel_dep(name = "score_toolchains_rust", version = "0.10.0", dev_dependency = T - bazel_dep(name = "score_docs_as_code", version = "8.0.1") +@@ -99,7 +99,7 @@ bazel_dep(name = "score_toolchains_rust", version = "0.10.0", dev_dependency = T + bazel_dep(name = "score_docs_as_code", version = "8.1.1") bazel_dep(name = "score_process_description", version = "2.1.2") -bazel_dep(name = "score_tooling", version = "2.2.1", dev_dependency = True) +bazel_dep(name = "score_tooling", version = "2.2.1") - bazel_dep(name = "score_platform", version = "0.7.1") + bazel_dep(name = "score_platform", version = "0.7.2") diff --git a/patches/baselibs/004-remove-hedron-and-clang-tidy-config.patch b/patches/baselibs/004-remove-hedron-and-clang-tidy-config.patch index 49d6d8cff42..a5b766467ae 100644 --- a/patches/baselibs/004-remove-hedron-and-clang-tidy-config.patch +++ b/patches/baselibs/004-remove-hedron-and-clang-tidy-config.patch @@ -1,17 +1,16 @@ diff --git a/BUILD b/BUILD -index e827820..d929475 100644 +index 492e70606..9c626ac5a 100644 --- a/BUILD +++ b/BUILD -@@ -11,8 +11,6 @@ +@@ -11,7 +11,6 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -load("@hedron_compile_commands//:refresh_compile_commands.bzl", "refresh_compile_commands") --load("@score_bazel_tools_cc//quality:defs.bzl", "quality_clang_tidy_config") load("@score_docs_as_code//:docs.bzl", "docs") load("@score_tooling//:defs.bzl", "copyright_checker", "dash_license_checker") load("@score_tooling//third_party/format:macros.bzl", "use_format_targets") -@@ -97,17 +95,6 @@ docs( +@@ -98,17 +97,6 @@ docs( source_dir = "docs", ) @@ -29,27 +28,3 @@ index e827820..d929475 100644 # Generate `rust_project.json`. # Required for `rust-analyzer` support. alias( -@@ -204,23 +191,3 @@ filegroup( - ], - visibility = ["//visibility:public"], - ) -- --quality_clang_tidy_config( -- name = "clang_tidy_config", -- additional_flags = [], -- clang_tidy_binary = "@llvm_toolchain//:clang-tidy", -- default_feature = "strict", -- dependency_attributes = [ -- "deps", -- "srcs", -- ], -- excludes = [], -- feature_mapping = { -- "//:.clang-tidy-minimal": "strict", -- }, -- target_types = [ -- "cc_library", -- ], -- unsupported_flags = [], -- visibility = ["//visibility:public"], --) diff --git a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch b/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch index 4aceee34d0f..bc916546678 100644 --- a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch +++ b/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch @@ -1,10 +1,8 @@ diff --git a/docs/index.rst b/docs/index.rst -index 0000000..0000000 100644 +index c2f4a6ef1..c4b8a57c1 100644 --- a/docs/index.rst +++ b/docs/index.rst -@@ -54,9 +54,18 @@ - :maxdepth: 1 - +@@ -56,6 +56,15 @@ The Components documentation provides detailed documentation for each individual baselibs/components/index @@ -18,6 +16,5 @@ index 0000000..0000000 100644 + + Quick Start - Building and Testing - ================================== + ---------------------------------- - For build instructions, usage examples, and configuration options, refer to the `README `_ in the `eclipse-score/baselibs `_ repository. diff --git a/patches/baselibs/007-lower-quick-start-heading.patch b/patches/baselibs/007-lower-quick-start-heading.patch deleted file mode 100644 index 63ee2211c4c..00000000000 --- a/patches/baselibs/007-lower-quick-start-heading.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/docs/index.rst b/docs/index.rst ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -68,2 +68,2 @@ - Quick Start - Building and Testing --================================== -+---------------------------------- diff --git a/patches/baselibs/008-rename-module-architecture-label.patch b/patches/baselibs/008-rename-module-architecture-label.patch deleted file mode 100644 index 40cebfded54..00000000000 --- a/patches/baselibs/008-rename-module-architecture-label.patch +++ /dev/null @@ -1,6 +0,0 @@ -diff --git a/docs/features/architecture/index.rst b/docs/features/architecture/index.rst ---- a/docs/features/architecture/index.rst -+++ b/docs/features/architecture/index.rst -@@ -14,1 +14,1 @@ --.. _baselibs_architecture: -+.. _baselibs_module_architecture: