diff --git a/.bazelrc b/.bazelrc index 00cae52c0a4..9fb6375866a 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 @@ -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 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 345f5061d98..4d015bcf054 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -274,6 +274,7 @@ "https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel": "99b8771e8c7cacb130170fed2a10c9e8fed26334a93e73b42d2953250885a158", "https://bcr.bazel.build/modules/grpc-java/1.66.0/MODULE.bazel": "86ff26209fac846adb89db11f3714b3dc0090fb2fb81575673cc74880cda4e7e", "https://bcr.bazel.build/modules/grpc-java/1.69.0/MODULE.bazel": "53887af6a00b3b406d70175d3d07e84ea9362016ff55ea90b9185f0227bfaf98", + "https://bcr.bazel.build/modules/grpc-java/1.70.0/MODULE.bazel": "cae8776b751f03c7984f651b00f604c297d7e759f1ce97da8fbf2fc7ce6cd226", "https://bcr.bazel.build/modules/grpc-java/1.75.0.bcr.1/MODULE.bazel": "ba818f142b40cc7fb82fbdc8a9f7475b6783cd7849f9a71da814bacaf0acfd74", "https://bcr.bazel.build/modules/grpc-java/1.78.0/MODULE.bazel": "48f790fbb95625245295df1283e0dba344a4e30b4a9a9cefbabfa92bd84f3691", "https://bcr.bazel.build/modules/grpc-java/1.78.0/source.json": "36c3a83c5ddeb864d7a4b97801456c464077f80a8216354ac1a71f7ce8699771", @@ -780,6 +781,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.62.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.66.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.69.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.70.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.75.0.bcr.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-java/1.78.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/grpc-proto/0.0.0-20240627-ec30f58/MODULE.bazel": "not found", @@ -1008,8 +1010,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.9/MODULE.bazel": "2f95cc2e07c5ed9df69e6af35a98843235ce43a96d0aef8c55398ebe6813b58a", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.9/source.json": "b94fa0e611e51d35c4742e2e49e6ee09750d68d79dc61b6028e758f08f58f849", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/MODULE.bazel": "5f14457f9b708302db05b5dc3c07bd41ae19b91cabf98a0dbffdca622bd6ac91", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/source.json": "2946be24c6b978aa788c934643aa7ec68aac4a926bea4eaa81d512fd48e9f4a8", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 86ba1857320..df4d2e2aa20 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -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", @@ -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", ) @@ -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", +) diff --git a/known_good.json b/known_good.json index 708b6bfdcbd..c35fb1f9910 100644 --- a/known_good.json +++ b/known_good.json @@ -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" ], @@ -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" @@ -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" ], @@ -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": [ @@ -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": { diff --git a/patches/communication/001-expose-comm-examples.patch b/patches/communication/001-expose-comm-examples.patch index 1692f66482d..3b3db54fb0e 100644 --- a/patches/communication/001-expose-comm-examples.patch +++ b/patches/communication/001-expose-comm-examples.patch @@ -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", ], ) diff --git a/patches/communication/003-module-deps-visibility.patch b/patches/communication/003-module-deps-visibility.patch index f157b11d0be..d05693fe630 100644 --- a/patches/communication/003-module-deps-visibility.patch +++ b/patches/communication/003-module-deps-visibility.patch @@ -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"], - ) - diff --git a/patches/config_management/BUILD b/patches/config_management/BUILD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/patches/lifecycle_health/001-fix-runapplication-string-literal-dep.patch b/patches/lifecycle_health/001-fix-runapplication-string-literal-dep.patch new file mode 100644 index 00000000000..c3205f0c583 --- /dev/null +++ b/patches/lifecycle_health/001-fix-runapplication-string-literal-dep.patch @@ -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", diff --git a/patches/lifecycle_health/BUILD b/patches/lifecycle_health/BUILD new file mode 100644 index 00000000000..e69de29bb2d