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
4 changes: 2 additions & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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_baselibs//src/log:safety_level=qm
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
4 changes: 2 additions & 2 deletions MODULE.bazel.lock

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

18 changes: 15 additions & 3 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@
# 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 = "82f9402474d6dd210fb0cfe5d1867f0d757318c4",
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 = "b43cd090b227953f59b5ef8335e4f6378679150d",
patch_strip = 1,
patches = [
"//patches/communication:001-expose-comm-examples.patch",
Expand Down Expand Up @@ -65,6 +66,10 @@ bazel_dep(name = "score_lifecycle_health")
git_override(
module_name = "score_lifecycle_health",
commit = "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714",
patch_strip = 1,
patches = [
"//patches/lifecycle_health:001-fix-runapplication-string-literal-dep.patch",
],
remote = "https://github.com/eclipse-score/lifecycle.git",
)

Expand All @@ -86,3 +91,10 @@ git_override(
commit = "414d4ce4d984e461db8153c95eceb9d5a2020f57",
remote = "https://github.com/eclipse-score/time.git",
)

bazel_dep(name = "score_config_management")
git_override(
module_name = "score_config_management",
commit = "f63a42acd04a8caa6dfc77c75c92a5c221a0452d",
remote = "https://github.com/eclipse-score/config_management.git",
)
21 changes: 17 additions & 4 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"target_sw": {
"score_baselibs": {
"repo": "https://github.com/eclipse-score/baselibs.git",
"version": "0.2.9",
"hash": "82f9402474d6dd210fb0cfe5d1867f0d757318c4",
"bazel_patches": [
"//patches/baselibs:001-restore-trace-library-mock-visibility.patch"
],
Expand All @@ -26,7 +26,7 @@
},
"score_communication": {
"repo": "https://github.com/eclipse-score/communication.git",
"hash": "0e0640998096049a8dd65a4173b03a988d5a85a7",
"hash": "b43cd090b227953f59b5ef8335e4f6378679150d",
"bazel_patches": [
"//patches/communication:001-expose-comm-examples.patch",
"//patches/communication:003-module-deps-visibility.patch"
Expand All @@ -52,7 +52,7 @@
],
"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 @@ -86,7 +86,9 @@
"score_lifecycle_health": {
"repo": "https://github.com/eclipse-score/lifecycle.git",
"hash": "654ac348e1cb9327e5c8c4d84fd0028ad3ef2714",
"bazel_patches": [],
"bazel_patches": [
"//patches/lifecycle_health:001-fix-runapplication-string-literal-dep.patch"
],
"metadata": {
"code_root_path": "//score/...",
"exclude_test_targets": [
Expand Down Expand Up @@ -126,6 +128,17 @@
"cpp"
]
}
},
"score_config_management": {
"repo": "https://github.com/eclipse-score/config_management.git",
"hash": "f63a42acd04a8caa6dfc77c75c92a5c221a0452d",
"bazel_patches": [],
"metadata": {
"code_root_path": "//score/config_management/...",
"langs": [
"cpp"
]
}
}
},
"tooling": {
Expand Down
12 changes: 10 additions & 2 deletions patches/communication/001-expose-comm-examples.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
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..16ede1bf 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(
@@ -30,6 +30,7 @@ rust_library(

rust_binary(
name = "com-api-example",
+ visibility = ["//visibility:public"],
srcs = ["main.rs"],
data = [
"etc/logging.json",
@@ -65,3 +66,7 @@ rust_test(
"@score_communication_crate_index//:tokio",
],
)
Expand Down
7 changes: 3 additions & 4 deletions patches/communication/003-module-deps-visibility.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
diff --git a/MODULE.bazel b/MODULE.bazel
index 5b4a75cd..5b4b7e17 100644
index 2f94adc..8f0fd30 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -369,7 +369,6 @@ git_override(
@@ -393,7 +393,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"],
)

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/score/launch_manager/src/lifecycle_client/BUILD b/score/launch_manager/src/lifecycle_client/BUILD
index 72a9c9cc..7b7dddcf 100644
--- a/score/launch_manager/src/lifecycle_client/BUILD
+++ b/score/launch_manager/src/lifecycle_client/BUILD
@@ -128,6 +128,7 @@ cc_library(
visibility = ["//score/launch_manager:__subpackages__"],
deps = [
":report_running",
+ "@score_baselibs//score/memory:string_literal",
"@score_baselibs//score/mw/log",
"@score_baselibs//score/os:stdlib",
"@score_baselibs//score/os/utils:signal",
Empty file.
Loading