From 3448ee6a3b6a03549c42ca86b57c4d0b8babc60f Mon Sep 17 00:00:00 2001 From: Arkadiusz Jedrzejewski Date: Mon, 29 Jun 2026 11:25:42 +0200 Subject: [PATCH] deps: use baselibs instead of baselibs_rust --- Cargo.lock | 26 ++++++++++++++-------- Cargo.toml | 10 ++++----- MODULE.bazel | 3 +-- MODULE.bazel.lock | 2 -- examples/cpp_supervised_app/BUILD | 2 +- examples/rust_supervised_app/BUILD | 4 ++-- score/health_monitor/src/rust/BUILD | 12 +++++----- tests/integration/complex_monitoring/BUILD | 2 +- 8 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 656cbc994..c4265f760 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -133,7 +133,16 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "containers" version = "0.1.0" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" +dependencies = [ + "elementary", + "score_log", +] + +[[package]] +name = "elementary" +version = "0.0.1" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" [[package]] name = "errno" @@ -276,10 +285,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "pal" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "containers", - "libc", "score_log", ] @@ -353,7 +361,7 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "score_log" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "score_log_fmt", "score_log_fmt_macro", @@ -362,12 +370,12 @@ dependencies = [ [[package]] name = "score_log_fmt" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" [[package]] name = "score_log_fmt_macro" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "proc-macro2", "quote", @@ -378,7 +386,7 @@ dependencies = [ [[package]] name = "score_testing_macros" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "quote", "stdout_logger", @@ -472,7 +480,7 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "stdout_logger" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "score_log", ] @@ -497,7 +505,7 @@ dependencies = [ [[package]] name = "thread" version = "0.0.1" -source = "git+https://github.com/eclipse-score/baselibs_rust.git?tag=v0.1.1#7227b67c45dff719901d8f3763d5a37fb55aa0ad" +source = "git+https://github.com/eclipse-score/baselibs.git?rev=f4f9df39275760a60e54e5e3c5112210e35ae2a3#f4f9df39275760a60e54e5e3c5112210e35ae2a3" dependencies = [ "pal", "score_log", diff --git a/Cargo.toml b/Cargo.toml index dfa1add75..5f6dce229 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,11 +21,11 @@ signal-hook = "0.3.18" alive_rs = { path = "score/launch_manager/src/alive/src/rust" } # Temporary API health_monitoring_lib = { path = "score/health_monitor/src" } -score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" } -score_testing_macros = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" } -stdout_logger = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" } -containers = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" } -thread = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" } +score_log = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" } +score_testing_macros = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" } +stdout_logger = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" } +containers = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" } +thread = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" } [workspace.lints.clippy] std_instead_of_core = "warn" diff --git a/MODULE.bazel b/MODULE.bazel index 5a1f930f5..6c4a08d34 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -132,11 +132,10 @@ oci.pull( ) use_repo(oci, "debian-test-runtime", "debian-test-runtime_linux_amd64") -bazel_dep(name = "score_baselibs_rust", version = "0.1.2") bazel_dep(name = "score_baselibs", version = "0.2.8") git_override( module_name = "score_baselibs", - commit = "d0145e0645d4fe9661a36c348f0e62e13cf73f98", + commit = "f4f9df39275760a60e54e5e3c5112210e35ae2a3", remote = "https://github.com/eclipse-score/baselibs.git", ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 61d892903..3a126046a 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -821,8 +821,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_rust/0.1.2/MODULE.bazel": "8a07e1c62986e941a6e182e39c9cd08391849eed55c2f4dbb02d72ef6f524346", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs_rust/0.1.2/source.json": "5d920b55b98cf3d87da75d5a3ab1915709867fda14991ef2843c5e7c33aa0391", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.2.2/MODULE.bazel": "343a1892b1d5c616e0b4cbecfb5e548fa69328d22bb4fd5862bdd3cfa902142b", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.2.2/source.json": "624c1addd22fff7fc894d0571d35c8e47cc2d3ff9e75b15b8fb1cff021391a30", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_platforms/0.0.2/MODULE.bazel": "32f0cbc08bb1c60279448d666aead6b5a000374a8a67f08822b258bf00a6a183", diff --git a/examples/cpp_supervised_app/BUILD b/examples/cpp_supervised_app/BUILD index 379938ed7..984f35938 100644 --- a/examples/cpp_supervised_app/BUILD +++ b/examples/cpp_supervised_app/BUILD @@ -34,6 +34,6 @@ cc_binary( deps = [ "//score/health_monitor:health_monitoring_cc", "//score/launch_manager:lifecycle_cc", - "@score_baselibs_rust//src/log/stdout_logger_cpp_init", + "@score_baselibs//src/log/stdout_logger_cpp_init", ], ) diff --git a/examples/rust_supervised_app/BUILD b/examples/rust_supervised_app/BUILD index f2715646a..9738ceb0b 100644 --- a/examples/rust_supervised_app/BUILD +++ b/examples/rust_supervised_app/BUILD @@ -36,8 +36,8 @@ rust_binary( deps = [ "//score/health_monitor:health_monitoring_rust", "//score/launch_manager:lifecycle_rust", - "@score_baselibs_rust//src/log/score_log", - "@score_baselibs_rust//src/log/stdout_logger", + "@score_baselibs//src/log/score_log", + "@score_baselibs//src/log/stdout_logger", "@score_crates//:clap", "@score_crates//:libc", "@score_crates//:signal_hook", diff --git a/score/health_monitor/src/rust/BUILD b/score/health_monitor/src/rust/BUILD index 7f578f022..db7db5084 100644 --- a/score/health_monitor/src/rust/BUILD +++ b/score/health_monitor/src/rust/BUILD @@ -14,14 +14,14 @@ load("@rules_rust//rust:defs.bzl", "miri_test", "rust_library", "rust_static_library", "rust_test") COMMON_RUST_DEPS = [ - "@score_baselibs_rust//src/containers:containers", - "@score_baselibs_rust//src/thread:thread", - "@score_baselibs_rust//src/log/score_log:score_log", + "@score_baselibs//src/containers:containers", + "@score_baselibs//src/thread:thread", + "@score_baselibs//src/log/score_log:score_log", "//score/launch_manager:alive_rust", ] PROC_MACRO_DEPS = [ - "@score_baselibs_rust//src/testing_macros:score_testing_macros", + "@score_baselibs//src/testing_macros:score_testing_macros", ] rust_library( @@ -72,7 +72,7 @@ rust_test( tags = [ "no-asan", ], - deps = ["@score_baselibs_rust//src/log/stdout_logger"], + deps = ["@score_baselibs//src/log/stdout_logger"], ) rust_test( @@ -99,7 +99,7 @@ rust_test( ], target_compatible_with = ["@platforms//os:linux"], deps = [ - "@score_baselibs_rust//src/log/stdout_logger", + "@score_baselibs//src/log/stdout_logger", "@score_crates//:loom", ], ) diff --git a/tests/integration/complex_monitoring/BUILD b/tests/integration/complex_monitoring/BUILD index 734f6cef2..086fdd289 100644 --- a/tests/integration/complex_monitoring/BUILD +++ b/tests/integration/complex_monitoring/BUILD @@ -50,7 +50,7 @@ cc_binary( "//score/launch_manager:lifecycle_cc", "//tests/utils/test_helper", "@googletest//:gtest_main", - "@score_baselibs_rust//src/log/stdout_logger_cpp_init", + "@score_baselibs//src/log/stdout_logger_cpp_init", ], )