Skip to content

Commit eae6c63

Browse files
committed
WIP
1 parent 8600354 commit eae6c63

9 files changed

Lines changed: 28 additions & 53 deletions

File tree

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ build --tool_java_runtime_version=remotejdk_17
2121

2222
build:_common --@score_baselibs//score/json:base_library=nlohmann
2323
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
24-
build:_common --@score_baselibs_rust//src/log:safety_level=qm
2524
build:_common --@score_baselibs//src/log:safety_level=qm
2625
build:_common --@score_baselibs//score/analysis/tracing/generic_trace_library:implementation=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation
2726
build:_common --cxxopt=-Wno-error=mismatched-new-delete

BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ docs(
2222
"@score_orchestrator//:needs_json",
2323
"@score_kyron//:needs_json",
2424
# "@score_baselibs//:needs_json", # score_tooling is dev_dependency
25-
"@score_baselibs_rust//:needs_json",
2625
# "@score_communication//:needs_json", # no docs_sources
2726
# "@score_lifecycle_health//:needs_json", # unreadable images - relative paths issue
2827
"@score_logging//:needs_json", # duplicated labels

MODULE.bazel.lock

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel_common/score_modules_target_sw.MODULE.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ single_version_override(
2424
version = "0.2.9",
2525
)
2626

27-
bazel_dep(name = "score_baselibs_rust")
28-
git_override(
29-
module_name = "score_baselibs_rust",
30-
commit = "4050b62f298b639d27c092f63858642c3d08f9a0",
31-
remote = "https://github.com/eclipse-score/baselibs_rust.git",
32-
)
33-
3427
bazel_dep(name = "score_communication")
3528
git_override(
3629
module_name = "score_communication",

bazel_common/score_modules_tooling.MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ git_override(
3838
bazel_dep(name = "score_platform")
3939
git_override(
4040
module_name = "score_platform",
41-
commit = "1b51518e71835b02aef97433c5dd083339185256",
41+
commit = "b29dcdd2d8033769d6f2315a8f16617555e48886",
4242
remote = "https://github.com/eclipse-score/score.git",
4343
)
4444

@@ -59,13 +59,13 @@ git_override(
5959
bazel_dep(name = "score_docs_as_code")
6060
git_override(
6161
module_name = "score_docs_as_code",
62-
commit = "1939bde2a3a3e023bcba726085be40471fd93fd4",
62+
commit = "45e72c76126044b3c6d4e4608d8463eb4e2935a3",
6363
remote = "https://github.com/eclipse-score/docs-as-code.git",
6464
)
6565

6666
bazel_dep(name = "score_process")
6767
git_override(
6868
module_name = "score_process",
69-
commit = "42cfa87d5650fe4b70fcb8dce1cc0e24b658d687",
69+
commit = "8df530cab5efcb40e9f835ba6e9b61ae2f0175c7",
7070
remote = "https://github.com/eclipse-score/process_description.git",
7171
)

bazel_common/score_rust_toolchains.MODULE.bazel

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,3 @@ use_repo(
4949
ferrocene,
5050
"ferrocene_aarch64_ebclfsa",
5151
)
52-
53-
# Pin the default host Rust toolchain above the rules_rust default (1.86.0).
54-
# score_baselibs / lifecycle use library APIs stabilized after 1.86
55-
# (is_multiple_of -> 1.87; NonNull::from_ref, str::from_utf8* inherent
56-
# constructors, array-length inference -> 1.89), so a newer stable toolchain
57-
# is required for the x86_64 host build.
58-
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
59-
rust.toolchain(
60-
edition = "2021",
61-
versions = ["1.89.0"],
62-
)
63-
use_repo(rust, "rust_toolchains")
64-
65-
register_toolchains("@rust_toolchains//:all")

docs/conf.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,20 @@ def _patch_needpie_suppress_legend() -> None:
4545
"score_sphinx_bundle",
4646
]
4747

48+
exclude_patterns = [
49+
# The following entries are not required when building the documentation via 'bazel
50+
# build //:docs', as that command runs in a sandboxed environment. However, when
51+
# building the documentation via 'bazel run //:docs' or esbonio, these
52+
# entries are required to prevent the build from failing.
53+
"**/CONTRIBUTION.md",
54+
"**/README.md",
55+
"**/.github/**",
56+
"**/improvement.md",
57+
"bazel-*",
58+
".venv*",
59+
"_build",
60+
]
61+
4862
# Enable markdown rendering
4963
source_suffix = {
5064
".rst": "restructuredtext",

known_good.json

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@
2424
]
2525
}
2626
},
27-
"score_baselibs_rust": {
28-
"repo": "https://github.com/eclipse-score/baselibs_rust.git",
29-
"hash": "4050b62f298b639d27c092f63858642c3d08f9a0",
30-
"metadata": {
31-
"code_root_path": "//src/...",
32-
"exclude_test_targets": [
33-
"//src/log/score_log_fmt_macro:tests"
34-
],
35-
"langs": [
36-
"rust"
37-
]
38-
}
39-
},
4027
"score_communication": {
4128
"repo": "https://github.com/eclipse-score/communication.git",
4229
"hash": "0e0640998096049a8dd65a4173b03a988d5a85a7",
@@ -70,6 +57,9 @@
7057
"exclude_test_targets": [
7158
"//src/cpp/tests:bm_kvs_cpp"
7259
],
60+
"bazel_patches": [
61+
"//patches/persistency:001-fix-docs.patch"
62+
],
7363
"rust_coverage_config": "ferrocene-coverage-per"
7464
}
7565
},
@@ -153,7 +143,7 @@
153143
},
154144
"score_platform": {
155145
"repo": "https://github.com/eclipse-score/score.git",
156-
"hash": "1b51518e71835b02aef97433c5dd083339185256"
146+
"hash": "b29dcdd2d8033769d6f2315a8f16617555e48886"
157147
},
158148
"score_bazel_platforms": {
159149
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
@@ -165,11 +155,11 @@
165155
},
166156
"score_docs_as_code": {
167157
"repo": "https://github.com/eclipse-score/docs-as-code.git",
168-
"hash": "1939bde2a3a3e023bcba726085be40471fd93fd4"
158+
"hash": "45e72c76126044b3c6d4e4608d8463eb4e2935a3"
169159
},
170160
"score_process": {
171161
"repo": "https://github.com/eclipse-score/process_description.git",
172-
"hash": "42cfa87d5650fe4b70fcb8dce1cc0e24b658d687"
162+
"hash": "8df530cab5efcb40e9f835ba6e9b61ae2f0175c7"
173163
}
174164
}
175165
},

rust_coverage/BUILD

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616

1717
load("@score_tooling//:defs.bzl", "rust_coverage_report")
1818

19-
rust_coverage_report(
20-
name = "rust_coverage_score_baselibs_rust",
21-
bazel_configs = [
22-
"linux-x86_64",
23-
"ferrocene-coverage",
24-
],
25-
query = 'kind("rust_test", @score_baselibs_rust//src/...) -@score_baselibs_rust//src/log/score_log_fmt_macro:tests',
26-
visibility = ["//visibility:public"],
27-
)
28-
2919
rust_coverage_report(
3020
name = "rust_coverage_score_communication",
3121
bazel_configs = [

0 commit comments

Comments
 (0)