Skip to content

Commit e520092

Browse files
committed
fix builds, reduce logging builds
1 parent ed7da09 commit e520092

File tree

4 files changed

+31
-24
lines changed

4 files changed

+31
-24
lines changed

.bazelrc

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,18 @@ common --registry=https://bcr.bazel.build
1717

1818
# Flags needed by score_baselibs and communication modules.
1919
# Do not add more!
20-
build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
21-
build --@score_baselibs//score/json:base_library=nlohmann
22-
build --@score_communication//score/mw/com/flags:tracing_library=stub
20+
common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
21+
common --@score_baselibs//score/json:base_library=nlohmann
22+
common --@score_communication//score/mw/com/flags:tracing_library=stub
23+
common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
24+
common --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False
25+
common --@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False
26+
common --@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False
27+
common --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False
28+
common --@score_logging//score/datarouter/build_configuration_flags:dlt_file_transfer_feature=False
29+
common --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True
30+
common --@score_logging//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
31+
common --@score_logging//score/mw/log/flags:KRemote_Logging=False
2332

2433
# stop legacy behavior of creating __init__.py files
2534
build --incompatible_default_to_explicit_init_py

build_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"build_targets": "-- @score_feo//... -@score_feo//:docs -@score_feo//:ide_support -@score_feo//:needs_json"
2323
},
2424
"score_logging": {
25-
"build_targets": "@score_logging//score/... --@score_baselibs//score/memory/shared/flags:use_typedshmd=False --@score_baselibs//score/json:base_library=nlohmann --@score_logging//score/datarouter/build_configuration_flags:persistent_logging=False --@score_logging//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False --@score_logging//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False --@score_logging//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False --@score_logging//score/datarouter/build_configuration_flags:dlt_file_transfer_feature=False --@score_logging//score/datarouter/build_configuration_flags:use_local_vlan=True"
25+
"build_targets": "@score_logging//score/mw/log"
2626
}
2727
}
2828
}

score_modules.MODULE.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,42 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2026-01-21T08:46:20+00:00Z
14+
# Generated from known_good.json at 2026-01-26T11:01:36+00:00Z
1515
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_baselibs")
1818
git_override(
1919
module_name = "score_baselibs",
2020
remote = "https://github.com/eclipse-score/baselibs.git",
21-
commit = "ccfe7dc563bedc77fe6e19bd7050104e80fdf7e1",
21+
commit = "fe74ff32f2cb8b2c99af019e7907ad9486e70b09",
2222
)
2323

2424
bazel_dep(name = "score_communication")
2525
git_override(
2626
module_name = "score_communication",
2727
remote = "https://github.com/eclipse-score/communication.git",
28-
commit = "1d3e115e953de771cfb6c780cf677cf3fe5e8bee",
28+
commit = "73caa2d2b6f45f806bbd30bdf8675ab1ad551387",
2929
)
3030

3131
bazel_dep(name = "score_logging")
3232
git_override(
3333
module_name = "score_logging",
3434
remote = "https://github.com/eclipse-score/logging.git",
35-
commit = "cddfb10832cf384ee5c3f8553fb898f56c1d1def",
35+
commit = "d5267a5d89ca7462bec29c49d3b295a10ee834c3",
3636
)
3737

3838
bazel_dep(name = "score_persistency")
3939
git_override(
4040
module_name = "score_persistency",
4141
remote = "https://github.com/eclipse-score/persistency.git",
42-
commit = "652f78a822dac698dcb60f80adbc3aea488ebee5",
42+
commit = "69356def0bd731fda9aedc8c65336d8c2ca499da",
4343
)
4444

4545
bazel_dep(name = "score_orchestrator")
4646
git_override(
4747
module_name = "score_orchestrator",
4848
remote = "https://github.com/eclipse-score/orchestrator.git",
49-
commit = "dcf5518ac78d01cc06ed8a7ffe9e476c2fa43bd6",
49+
commit = "18e136c34750c5db707f27f917d52efc7541e087",
5050
)
5151

5252
bazel_dep(name = "score_kyron")
@@ -67,14 +67,14 @@ bazel_dep(name = "score_tooling")
6767
git_override(
6868
module_name = "score_tooling",
6969
remote = "https://github.com/eclipse-score/tooling.git",
70-
commit = "092d229dbc671febe87ddce5c9763b1f62e2dbaf",
70+
commit = "8894fe5440436a8c6d9e214c97b18d619c7f7eac",
7171
)
7272

7373
bazel_dep(name = "score_platform")
7474
git_override(
7575
module_name = "score_platform",
7676
remote = "https://github.com/eclipse-score/score.git",
77-
commit = "dafe356f60f725ff77941c220200e1df28965d2d",
77+
commit = "f4769c4b86bfe46b29b56b6c3e262c5b82db334b",
7878
)
7979

8080
bazel_dep(name = "score_bazel_platforms")
@@ -95,12 +95,12 @@ bazel_dep(name = "score_docs_as_code")
9595
git_override(
9696
module_name = "score_docs_as_code",
9797
remote = "https://github.com/eclipse-score/docs-as-code.git",
98-
commit = "d9f95fd2fdf2df494a8d499b5f061a84f320b53b",
98+
commit = "a9babc30a7ab1ac43c75415b9784b2bc81ed0f9d",
9999
)
100100

101101
bazel_dep(name = "score_process")
102102
git_override(
103103
module_name = "score_process",
104104
remote = "https://github.com/eclipse-score/process_description.git",
105-
commit = "86f77b5514e32694efed3541558041b653830380",
105+
commit = "496fb6dc347de414d9cbe7523204fdeb6b511197",
106106
)

scripts/known_good/update_module_latest.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,22 @@ def main(argv: list[str]) -> int:
133133

134134
for mod in known_good.modules.values():
135135
try:
136-
# Use module-specific branch if available, otherwise use command-line branch
137136
branch = mod.branch if mod.branch else args.branch
138137
if use_gh:
139138
latest = fetch_latest_commit_gh(mod.owner_repo, branch)
140139
else:
141140
latest = fetch_latest_commit(mod.owner_repo, branch, token)
142-
143-
# Only reuse version if hash did not change
144-
if latest != mod.hash:
141+
142+
old_hash = mod.hash
143+
if latest != old_hash:
145144
mod.hash = latest
146145
mod.version = None # Clear version when hash changes
147-
148-
# Display format: if version exists, show "version -> hash", otherwise "hash -> hash"
149-
if mod.version:
150-
print(f"{mod.name}: {mod.version} -> {latest[:8]} (branch {branch})")
146+
if mod.version:
147+
print(f"{mod.name}: {mod.version} -> {latest[:8]} (branch {branch})")
148+
else:
149+
print(f"{mod.name}: {old_hash[:8]} -> {latest[:8]} (branch {branch})")
151150
else:
152-
old_hash = known_good.modules[mod.name].hash
153-
print(f"{mod.name}: {old_hash[:8]} -> {latest[:8]} (branch {branch})")
151+
print(f"{mod.name}: {old_hash[:8]} (no update)")
154152
except Exception as e: # noqa: BLE001
155153
failures += 1
156154
print(f"ERROR {mod.name}: {e}", file=sys.stderr)

0 commit comments

Comments
 (0)