Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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_communication//score/mw/com/flags:tracing_library=stub
build:_common --@score_communication//score/mw/com/flags:tracing_library=@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
build:_common --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
Expand Down
3 changes: 3 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ bazel_dep(name = "aspect_rules_lint", version = "2.0.0")
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
bazel_dep(name = "score_rust_policies", version = "0.0.3")

# Force grpc-java to 1.70.0 for compatibility with grpc 1.70.1
bazel_dep(name = "grpc-java", version = "1.70.0")

# TRLC dependency for requirements traceability
bazel_dep(name = "trlc")
git_override(
Expand Down
584 changes: 151 additions & 433 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

19 changes: 6 additions & 13 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,9 @@
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py

bazel_dep(name = "score_baselibs")
git_override(
single_version_override(
module_name = "score_baselibs",
commit = "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e",
patch_strip = 1,
patches = [
"//patches/baselibs:003-acl-fixes-for-aarch64.patch",
],
remote = "https://github.com/eclipse-score/baselibs.git",
version = "0.2.7",
)

bazel_dep(name = "score_baselibs_rust")
Expand All @@ -33,14 +28,13 @@ git_override(
)

bazel_dep(name = "score_communication")
git_override(
single_version_override(
module_name = "score_communication",
commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
patch_strip = 1,
patches = [
"//patches/communication:001-expose-comm-examples.patch",
],
remote = "https://github.com/eclipse-score/communication.git",
version = "0.2.1",
)

bazel_dep(name = "score_persistency")
Expand Down Expand Up @@ -72,8 +66,7 @@ git_override(
)

bazel_dep(name = "score_logging")
git_override(
single_version_override(
module_name = "score_logging",
commit = "80feaae8ffaa2448c3872011b724e1668ad2930e",
remote = "https://github.com/eclipse-score/logging.git",
version = "0.2.1",
)
12 changes: 5 additions & 7 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
"target_sw": {
"score_baselibs": {
"repo": "https://github.com/eclipse-score/baselibs.git",
"hash": "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e",
"bazel_patches": [
"//patches/baselibs:003-acl-fixes-for-aarch64.patch"
],
"version": "0.2.7",
"metadata": {
"extra_test_config": [
"//score/json:base_library=nlohmann",
Expand Down Expand Up @@ -38,7 +35,7 @@
},
"score_communication": {
"repo": "https://github.com/eclipse-score/communication.git",
"hash": "56448a5589a5f7d3921b873e8127b824a8c1ca95",
"version": "0.2.1",
"bazel_patches": [
"//patches/communication:001-expose-comm-examples.patch"
],
Expand All @@ -48,7 +45,8 @@
"//score/mw/com/impl:unit_test_runtime_single_exec",
"//score/mw/com/impl/configuration:config_parser_test",
"//score/mw/com/impl/configuration:configuration_test",
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test"
"//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test",
"//score/mw/com/impl/tracing/configuration:validate_comtrace_filter_config_schema"
]
}
},
Expand Down Expand Up @@ -91,7 +89,7 @@
},
"score_logging": {
"repo": "https://github.com/eclipse-score/logging.git",
"hash": "80feaae8ffaa2448c3872011b724e1668ad2930e",
"version": "0.2.1",
"metadata": {
"extra_test_config": [
"//score/datarouter/build_configuration_flags:persistent_logging=False",
Expand Down
14 changes: 7 additions & 7 deletions patches/communication/001-expose-comm-examples.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/score/mw/com/example/ipc_bridge/BUILD b/score/mw/com/example/ipc_bridge/BUILD
index 525969e..19e0fc3 100644
--- a/score/mw/com/example/ipc_bridge/BUILD
+++ b/score/mw/com/example/ipc_bridge/BUILD
@@ -31,6 +31,7 @@ cc_binary(
"@score_baselibs//score/language/futurecpp",
"@score_logging//score/mw/log",
@@ -24,7 +24,7 @@
],
data = ["etc/mw_com_config.json"],
features = COMPILER_WARNING_FEATURES,
- visibility = ["//examples:__pkg__"],
+ visibility = ["//visibility:public"],
)

cc_library(
deps = [
":sample_sender_receiver",
"//score/mw/com",
2 changes: 1 addition & 1 deletion rust_coverage/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ rust_coverage_report(
"linux-x86_64",
"ferrocene-coverage",
],
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test',
query = 'kind("rust_test", @score_communication//score/mw/com/impl/...) -@score_communication//score/mw/com/impl:unit_test_runtime_single_exec -@score_communication//score/mw/com/impl/configuration:config_parser_test -@score_communication//score/mw/com/impl/configuration:configuration_test -@score_communication//score/mw/com/impl/tracing/configuration:tracing_filter_config_parser_test -@score_communication//score/mw/com/impl/tracing/configuration:validate_comtrace_filter_config_schema',
visibility = ["//visibility:public"],
)

Expand Down
Loading