From 3df3011a2d722a1ffc63acfb9d38d9b7feef8610 Mon Sep 17 00:00:00 2001 From: rahulsasingh Date: Tue, 1 Sep 2026 10:29:00 +0000 Subject: [PATCH] [Test] score_logging integration - Bumps score_logging to v0.2.3 --- .bazelrc | 2 -- MODULE.bazel.lock | 2 ++ .../score_modules_target_sw.MODULE.bazel | 7 ++--- known_good.json | 9 ++---- ...2-needs-json-deps-not-dev-dependency.patch | 14 --------- .../003-docs-as-code-not-dev-dependency.patch | 12 ------- .../004-rules-pkg-not-dev-dependency.patch | 13 -------- ...memory-shared-moved-to-communication.patch | 31 ------------------- .../006-use-format-targets-compat.patch | 13 ++++++++ 9 files changed, 19 insertions(+), 84 deletions(-) delete mode 100644 patches/logging/002-needs-json-deps-not-dev-dependency.patch delete mode 100644 patches/logging/003-docs-as-code-not-dev-dependency.patch delete mode 100644 patches/logging/004-rules-pkg-not-dev-dependency.patch delete mode 100644 patches/logging/005-memory-shared-moved-to-communication.patch create mode 100644 patches/logging/006-use-format-targets-compat.patch diff --git a/.bazelrc b/.bazelrc index 171993f8e07..18c8b36e35f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -38,8 +38,6 @@ build:_common --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_ build:_common --extra_toolchains=//bazel/toolchains:score_ref_int_libclang_toolchain # Flags needed by datarouter -build:_common --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False -build:_common --@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False build:_common --@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False build:_common --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration=False build:_common --@score_logging//score/datarouter/build_configuration_flags:file_transfer=False diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 122d89cc7b3..a31a4a2fd08 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1000,6 +1000,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/1.0.3/source.json": "47eab63b3a98244787a9ab611f825d9c62d48bfdb5000173144d2f9e24b521b8", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/source.json": "ef316fad71fdbd53daf43fc0a82fbc7c293908a2712214ff79134c177d028024", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.2/MODULE.bazel": "1076b36d2d05ab1a18df0746f6a545869eec6927019d651af99d99ef056e2023", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.2/source.json": "f76099f076243e2641803971e2a95ed27f24756c9bdda5d10a808c664996f0fc", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/source.json": "28ed0207a16f8498a84fae4983fa73060805003a4fbd68c6d749e2f1cc14601f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_qnx_unit_tests/0.2.0/MODULE.bazel": "aaffff67916dd058737aac8e04368f12b214e7646ff58adbab48e6429d1a5410", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 5b9f7c73311..d574b5b23cf 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -68,13 +68,10 @@ git_override( bazel_dep(name = "score_logging") git_override( module_name = "score_logging", - commit = "e1bf097cdbf718f993ab7b24ae5f59639ed96bdb", + commit = "6d8fcb3734e3f3307615bae5495d2d3a82b0b8c4", patch_strip = 1, patches = [ - "//patches/logging:002-needs-json-deps-not-dev-dependency.patch", - "//patches/logging:003-docs-as-code-not-dev-dependency.patch", - "//patches/logging:004-rules-pkg-not-dev-dependency.patch", - "//patches/logging:005-memory-shared-moved-to-communication.patch", + "//patches/logging:006-use-format-targets-compat.patch", ], remote = "https://github.com/eclipse-score/logging.git", ) diff --git a/known_good.json b/known_good.json index 10bed0ed80c..15820268781 100644 --- a/known_good.json +++ b/known_good.json @@ -94,18 +94,13 @@ }, "score_logging": { "repo": "https://github.com/eclipse-score/logging.git", - "hash": "e1bf097cdbf718f993ab7b24ae5f59639ed96bdb", + "hash": "6d8fcb3734e3f3307615bae5495d2d3a82b0b8c4", "bazel_patches": [ - "//patches/logging:002-needs-json-deps-not-dev-dependency.patch", - "//patches/logging:003-docs-as-code-not-dev-dependency.patch", - "//patches/logging:004-rules-pkg-not-dev-dependency.patch", - "//patches/logging:005-memory-shared-moved-to-communication.patch" + "//patches/logging:006-use-format-targets-compat.patch" ], "metadata": { "code_root_path": "//score/mw/log/...", "extra_test_config": [ - "@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False", - "@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False", "@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False", "@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration=False", "@score_logging//score/datarouter/build_configuration_flags:file_transfer=False", diff --git a/patches/logging/002-needs-json-deps-not-dev-dependency.patch b/patches/logging/002-needs-json-deps-not-dev-dependency.patch deleted file mode 100644 index 30bd43bbb71..00000000000 --- a/patches/logging/002-needs-json-deps-not-dev-dependency.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -47,8 +47,8 @@ single_version_override( - - bazel_dep(name = "score_rust_policies", version = "0.0.5") - --bazel_dep(name = "score_process", version = "1.5.4", dev_dependency = True) --bazel_dep(name = "score_platform", version = "0.6.0", dev_dependency = True) -+bazel_dep(name = "score_process", version = "1.5.4") -+bazel_dep(name = "score_platform", version = "0.6.0") - bazel_dep(name = "score_itf", version = "0.5.0", dev_dependency = True) - - # OCI / Docker image rules for integration tests diff --git a/patches/logging/003-docs-as-code-not-dev-dependency.patch b/patches/logging/003-docs-as-code-not-dev-dependency.patch deleted file mode 100644 index 40caa15eff1..00000000000 --- a/patches/logging/003-docs-as-code-not-dev-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -37,7 +37,7 @@ bazel_dep(name = "platforms", version = "1.0.0") - # S-CORE process rules - bazel_dep(name = "score_bazel_platforms", version = "0.1.2") - --bazel_dep(name = "score_docs_as_code", version = "4.6.0", dev_dependency = True) -+bazel_dep(name = "score_docs_as_code", version = "4.6.0") - - bazel_dep(name = "score_tooling", version = "1.2.0") - single_version_override( diff --git a/patches/logging/004-rules-pkg-not-dev-dependency.patch b/patches/logging/004-rules-pkg-not-dev-dependency.patch deleted file mode 100644 index e506454eebe..00000000000 --- a/patches/logging/004-rules-pkg-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 5eed2f9..06fb222 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -53,7 +53,7 @@ bazel_dep(name = "score_itf", version = "0.5.0", dev_dependency = True) - - # OCI / Docker image rules for integration tests - bazel_dep(name = "rules_oci", version = "2.2.7", dev_dependency = True) --bazel_dep(name = "rules_pkg", version = "1.2.0", dev_dependency = True) -+bazel_dep(name = "rules_pkg", version = "1.2.0") - - # QNX image filesystem rules for QNX integration tests - bazel_dep(name = "score_rules_imagefs", version = "0.0.1", dev_dependency = True) diff --git a/patches/logging/005-memory-shared-moved-to-communication.patch b/patches/logging/005-memory-shared-moved-to-communication.patch deleted file mode 100644 index 3ff1f5b1a12..00000000000 --- a/patches/logging/005-memory-shared-moved-to-communication.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream baselibs migrated score/memory/shared to score_communication in commit -b90e0695 ("Migrate score/memory/shared to score_communication"). score_logging -still points at the old @score_baselibs labels; score_communication is already a -bazel_dep here, so only the labels need redirecting. - -diff --git a/score/mw/log/backend/BUILD b/score/mw/log/backend/BUILD -index 846c781f..de1997f8 100644 ---- a/score/mw/log/backend/BUILD -+++ b/score/mw/log/backend/BUILD -@@ -72,7 +72,7 @@ cc_library( - "//score/mw/log/legacy_non_verbose_api", - "@score_baselibs//score/concurrency", - "@score_baselibs//score/os:errno_logging", -- "@score_baselibs//score/memory/shared", -+ "@score_communication//score/memory/shared", - ], - "//conditions:default": [], - }), -diff --git a/score/mw/log/detail/data_router/BUILD b/score/mw/log/detail/data_router/BUILD -index a4c21083..73e92d7a 100644 ---- a/score/mw/log/detail/data_router/BUILD -+++ b/score/mw/log/detail/data_router/BUILD -@@ -61,7 +61,7 @@ cc_library( - "@score_baselibs//score/concurrency", - "@score_baselibs//score/concurrency:thread_pool", - "@score_baselibs//score/language/futurecpp", -- "@score_baselibs//score/memory/shared", # Preperation for full rollout of (Ticket-105741), build cyclic dependency is broken (runtime, in next commit) -+ "@score_communication//score/memory/shared", # Preperation for full rollout of (Ticket-105741), build cyclic dependency is broken (runtime, in next commit) - "@score_baselibs//score/mw/log:recorder", - "@score_baselibs//score/mw/log/configuration", - "@score_baselibs//score/mw/log/detail:backend_interface", diff --git a/patches/logging/006-use-format-targets-compat.patch b/patches/logging/006-use-format-targets-compat.patch new file mode 100644 index 00000000000..b6695a77926 --- /dev/null +++ b/patches/logging/006-use-format-targets-compat.patch @@ -0,0 +1,13 @@ +diff --git a/BUILD b/BUILD +--- a/BUILD ++++ b/BUILD +@@ -11,8 +11,7 @@ + # SPDX-License-Identifier: Apache-2.0 + # ******************************************************************************* + load("@score_docs_as_code//:docs.bzl", "docs") +-load("@score_tooling//:defs.bzl", "copyright_checker", "setup_starpls") +-load("@score_tooling//third_party/format:macros.bzl", "use_format_targets") ++load("@score_tooling//:defs.bzl", "copyright_checker", "setup_starpls", "use_format_targets") + + setup_starpls( + name = "starpls_server",