Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ build --java_runtime_version=remotejdk_17
build --tool_java_runtime_version=remotejdk_17

build:_common --@score_baselibs//score/json:base_library=nlohmann
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
build:_common --@score_baselibs//src/log:safety_level=qm
build:_common --@score_communication//score/memory/shared/flags:use_typedshmd=False
build:_common --@score_baselibs//score/log_rust:safety_level=qm
build:_common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
build:_common --cxxopt=-Wno-error=mismatched-new-delete
build:_common --host_platform=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
Expand Down Expand Up @@ -94,7 +94,7 @@ build:ferrocene-coverage --remote_download_all

# Persistency specific flags
build:ferrocene-coverage-per --config=ferrocene-coverage
build:ferrocene-coverage-per --@score_baselibs//src/log:safety_level=qm
build:ferrocene-coverage-per --@score_baselibs//score/log_rust:safety_level=qm
build:ferrocene-coverage-per --@score_baselibs//score/json:base_library=nlohmann
build:ferrocene-coverage-per --@score_logging//score/mw/log/flags:KRemote_Logging=False

Expand Down
5 changes: 3 additions & 2 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 15 additions & 8 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,37 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

# Generated from known_good.json at 2026-07-03T00:00:00+00:00Z
# Generated from known_good.json at 2026-07-31T00:00:00+00:00Z
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py

bazel_dep(name = "score_baselibs")
single_version_override(
git_override(
module_name = "score_baselibs",
commit = "06f6b9b7d48710438ea4664d84da5143594763cb",
patch_strip = 1,
patches = [
"//patches/baselibs:001-restore-trace-library-mock-visibility.patch",
],
version = "0.2.9",
remote = "https://github.com/eclipse-score/baselibs.git",
)

bazel_dep(name = "score_communication")
git_override(
module_name = "score_communication",
commit = "0e0640998096049a8dd65a4173b03a988d5a85a7",
commit = "21652a6196c22bdf89e0a0abb34aabeb79eb26a0",
patch_strip = 1,
patches = [
"//patches/communication:001-expose-comm-examples.patch",
"//patches/communication:003-module-deps-visibility.patch",
"//patches/communication:004-rules-build-error-not-dev-dependency.patch",
],
remote = "https://github.com/eclipse-score/communication.git",
)

bazel_dep(name = "score_persistency")
git_override(
module_name = "score_persistency",
commit = "35a937f34ff5b2daad8df56e36de76687f19d631",
commit = "b987d375e54f038c31f9441fa738c747c7a07c75",
patch_strip = 1,
patches = [
"//patches/persistency:001-fix-doc.patch",
Expand All @@ -64,26 +66,31 @@ git_override(
bazel_dep(name = "score_lifecycle_health")
git_override(
module_name = "score_lifecycle_health",
commit = "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714",
commit = "23e9849437c578ade99b8ccbf5d09c1835737b3f",
remote = "https://github.com/eclipse-score/lifecycle.git",
)

bazel_dep(name = "score_logging")
git_override(
module_name = "score_logging",
commit = "a6da5cfca65c1a2402f94ef65a61aa7737d1aa32",
commit = "e1bf097cdbf718f993ab7b24ae5f59639ed96bdb",
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",
],
remote = "https://github.com/eclipse-score/logging.git",
)

bazel_dep(name = "score_time")
git_override(
module_name = "score_time",
commit = "414d4ce4d984e461db8153c95eceb9d5a2020f57",
commit = "8c42d34698535dabeaa4782d5ec123256151fb30",
patch_strip = 1,
patches = [
"//patches/time:001-memory-shared-moved-to-communication.patch",
],
remote = "https://github.com/eclipse-score/time.git",
)
2 changes: 1 addition & 1 deletion bazel_common/score_modules_tooling.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************

# Generated from known_good.json at 2026-07-03T00:00:00+00:00Z
# Generated from known_good.json at 2026-07-31T00:00:00+00:00Z
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py

bazel_dep(name = "score_crates")
Expand Down
38 changes: 23 additions & 15 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@
"target_sw": {
"score_baselibs": {
"repo": "https://github.com/eclipse-score/baselibs.git",
"version": "0.2.9",
"hash": "06f6b9b7d48710438ea4664d84da5143594763cb",
"bazel_patches": [
"//patches/baselibs:001-restore-trace-library-mock-visibility.patch"
],
"metadata": {
"extra_test_config": [
"@score_baselibs//score/json:base_library=nlohmann",
"@score_baselibs//score/memory/shared/flags:use_typedshmd=False"
"@score_baselibs//score/json:base_library=nlohmann"
],
"exclude_test_targets": [
"//score/language/safecpp/aborts_upon_exception:abortsuponexception_toolchain_test",
"//score/containers:dynamic_array_test",
"//score/mw/log/configuration:*",
"//score/json/examples:*",
"//score/flatbuffers/examples/config_usecase:demo_app"
"//score/flatbuffers:version_reader_test"
],
"langs": [
"cpp"
Expand All @@ -26,18 +25,23 @@
},
"score_communication": {
"repo": "https://github.com/eclipse-score/communication.git",
"hash": "0e0640998096049a8dd65a4173b03a988d5a85a7",
"hash": "21652a6196c22bdf89e0a0abb34aabeb79eb26a0",
"bazel_patches": [
"//patches/communication:001-expose-comm-examples.patch",
"//patches/communication:003-module-deps-visibility.patch"
"//patches/communication:003-module-deps-visibility.patch",
"//patches/communication:004-rules-build-error-not-dev-dependency.patch"
],
"metadata": {
"code_root_path": "//score/mw/com/impl/...",
"extra_test_config": [
"@score_communication//score/memory/shared/flags:use_typedshmd=False"
],
"exclude_test_targets": [
"//score/mw/com/impl:unit_test_runtime_single_exec",
"//score/mw/com/impl:runtime_test",
"//score/mw/com/impl/configuration:config_parser_test",
"//score/mw/com/impl/configuration:configuration_test",
"//score/mw/com/impl/configuration:configuration_json_parsing_strategy_test",
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test",
"//score/mw/com/impl/tracing:tracing_runtime_test",
"//score/mw/com/impl/bindings/lola/tracing:tracing_runtime_test"
Expand All @@ -46,13 +50,13 @@
},
"score_persistency": {
"repo": "https://github.com/eclipse-score/persistency.git",
"hash": "35a937f34ff5b2daad8df56e36de76687f19d631",
"hash": "b987d375e54f038c31f9441fa738c747c7a07c75",
"bazel_patches": [
"//patches/persistency:001-fix-doc.patch"
],
"metadata": {
"extra_test_config": [
"@score_baselibs//src/log:safety_level=qm",
"@score_baselibs//score/log_rust:safety_level=qm",
"@score_baselibs//score/json:base_library=nlohmann",
"@score_logging//score/mw/log/flags:KRemote_Logging=False"
],
Expand Down Expand Up @@ -85,24 +89,25 @@
},
"score_lifecycle_health": {
"repo": "https://github.com/eclipse-score/lifecycle.git",
"hash": "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714",
"hash": "23e9849437c578ade99b8ccbf5d09c1835737b3f",
"bazel_patches": [],
"metadata": {
"code_root_path": "//score/...",
"exclude_test_targets": [
"//score/health_monitor/src/rust:miri_tests",
"//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue_tsan_test"
"//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue_tsan_test",
"//score/launch_manager/src/daemon/src/common/concurrency:mpsc_bounded_queue_tsan_test"
]
}
},
"score_logging": {
"repo": "https://github.com/eclipse-score/logging.git",
"hash": "a6da5cfca65c1a2402f94ef65a61aa7737d1aa32",
"hash": "e1bf097cdbf718f993ab7b24ae5f59639ed96bdb",
"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:004-rules-pkg-not-dev-dependency.patch",
"//patches/logging:005-memory-shared-moved-to-communication.patch"
],
"metadata": {
"code_root_path": "//score/mw/log/...",
Expand All @@ -121,7 +126,10 @@
},
"score_time": {
"repo": "https://github.com/eclipse-score/time.git",
"hash": "414d4ce4d984e461db8153c95eceb9d5a2020f57",
"hash": "8c42d34698535dabeaa4782d5ec123256151fb30",
"bazel_patches": [
"//patches/time:001-memory-shared-moved-to-communication.patch"
],
"metadata": {
"langs": [
"cpp"
Expand Down Expand Up @@ -164,5 +172,5 @@
}
}
},
"timestamp": "2026-07-03T00:00:00+00:00Z"
"timestamp": "2026-07-31T00:00:00+00:00Z"
}
16 changes: 14 additions & 2 deletions patches/communication/001-expose-comm-examples.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
Expose the com-api-example binary and its mw_com config to the reference
integration showcase bundle. Upstream dropped the public visibility on the
rust_binary, and the config file was never exported.

diff --git a/score/mw/com/example/com-api-example/BUILD b/score/mw/com/example/com-api-example/BUILD
index 91bfb109..b72591ca 100644
index 10e02502..a4273bf8 100644
--- a/score/mw/com/example/com-api-example/BUILD
+++ b/score/mw/com/example/com-api-example/BUILD
@@ -37,3 +37,7 @@ rust_test(
@@ -40,6 +40,7 @@ rust_binary(
"MW_LOG_CONFIG_FILE": "score/mw/com/example/com-api-example/etc/logging.json",
},
features = ["link_std_cpp_lib"],
+ visibility = ["//visibility:public"],
deps = [
":com-api-example-lib",
"//score/mw/com/example/com-api-example/com-api-gen",
@@ -65,3 +66,7 @@ rust_test(
"@score_communication_crate_index//:tokio",
],
)
Expand Down
6 changes: 2 additions & 4 deletions patches/communication/003-module-deps-visibility.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 5b4a75cd..5b4b7e17 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -369,7 +369,6 @@ git_override(
@@ -395,7 +395,6 @@ git_override(
download_archive(
name = "json_schema_validator",
build = "//third_party/json_schema_validator:json_schema_validator.BUILD",
- dev_dependency = True,
integrity = "sha256-g/YdgRL0heDT8ectUWELo5JLF5kmqDdq7zwDh3D68gI=",
strip_prefix = "json-schema-validator-2.1.0",
urls = ["https://github.com/pboettch/json-schema-validator/archive/refs/tags/2.1.0.tar.gz"],
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -382,7 +382,7 @@

bazel_dep(name = "aspect_rules_lint", version = "2.5.0", dev_dependency = True)
bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
-bazel_dep(name = "rules_build_error", version = "0.11.0", dev_dependency = True)
+bazel_dep(name = "rules_build_error", version = "0.11.0")
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1", dev_dependency = True)
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ diff --git a/MODULE.bazel b/MODULE.bazel
-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.4.0", dev_dependency = True)
bazel_dep(name = "score_itf", version = "0.5.0", dev_dependency = True)

# OCI / Docker image rules for integration tests
2 changes: 1 addition & 1 deletion patches/logging/004-rules-pkg-not-dev-dependency.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff --git a/MODULE.bazel b/MODULE.bazel
index 5eed2f9..06fb222 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -47,7 +47,7 @@ bazel_dep(name = "score_itf", version = "0.4.0", dev_dependency = True)
@@ -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)
Expand Down
31 changes: 31 additions & 0 deletions patches/logging/005-memory-shared-moved-to-communication.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
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",
Loading
Loading