Skip to content

Commit f60d039

Browse files
committed
com has no score prefix on main, add wait_free_stack_fix
1 parent 1c3cfdf commit f60d039

10 files changed

+59
-22
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ common --registry=https://bcr.bazel.build
2020
build --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
2121
build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
2222
build --@score_baselibs//score/json:base_library=nlohmann
23-
build --@score_communication//score/mw/com/flags:tracing_library=stub
23+
build --@communication//score/mw/com/flags:tracing_library=stub
2424

2525
# stop legacy behavior of creating __init__.py files
2626
build --incompatible_default_to_explicit_init_py

MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ use_repo(pip, "pip_score_venv_test")
4747

4848
# communication module dependencies
4949
# archive_override are not forwarded by bazel_dep, so we need to redefine it here
50-
archive_override(
51-
module_name = "rules_boost",
52-
strip_prefix = "rules_boost-master",
53-
urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
54-
)
50+
# archive_override(
51+
# module_name = "rules_boost",
52+
# strip_prefix = "rules_boost-master",
53+
# urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
54+
# )
5555

5656
# git_override are not forwarded by bazel_dep, so we need to redefine it here
5757
git_override(

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bazel build --config bl-x86_64-linux @score_baselibs//score/... --verbose_failur
2727

2828
### Communication
2929
```bash
30-
bazel build --config bl-x86_64-linux @score_communication//score/mw/com:com --verbose_failures
30+
bazel build --config bl-x86_64-linux @communication//score/mw/com:com --verbose_failures
3131
```
3232

3333
### Persistency

integration_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mkdir -p "${LOG_DIR}" || true
1111

1212
declare -A BUILD_TARGET_GROUPS=(
1313
[baselibs]="@score_baselibs//score/..."
14-
[score_communication]="@score_communication//score/mw/com:com"
14+
[communication]="@communication//score/mw/com:com"
1515
[persistency]="@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
1616
#[score_logging]="@score_logging//src/..."
1717
[score_orchestrator]="@score_orchestrator//src/..."

known_good.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
{
55
"name": "score_baselibs",
66
"version": "0.1.3",
7-
"repo": "https://github.com/eclipse-score/baselibs.git"
7+
"repo": "https://github.com/eclipse-score/baselibs.git",
8+
"patches": [
9+
"//:wait_free_stack_fix.patch"
10+
]
811
},
912
{
10-
"name": "score_communication",
13+
"name": "communication",
1114
"version": "0.1.1",
1215
"repo": "https://github.com/eclipse-score/communication.git"
1316
},

known_good.updated.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
2-
"timestamp": "2025-11-12T10:56:14Z",
2+
"timestamp": "2025-11-13T08:26:11Z",
33
"modules": [
44
{
55
"name": "score_baselibs",
66
"repo": "https://github.com/eclipse-score/baselibs.git",
7-
"hash": "18badf00dc2210d11ef310049a78644ff3d039a3"
7+
"hash": "edc4f8841c2210d11ef310049a78644ff3d039a3",
8+
"patches": [
9+
"//:wait_free_stack_fix.patch"
10+
]
811
},
912
{
10-
"name": "score_communication",
13+
"name": "communication",
1114
"repo": "https://github.com/eclipse-score/communication.git",
1215
"hash": "ff40e5f1e90ce406b71c664cc6c8e902ab465305"
1316
},
@@ -29,7 +32,7 @@
2932
{
3033
"name": "score_platform",
3134
"repo": "https://github.com/eclipse-score/score.git",
32-
"hash": "6e2a756c5c52a6587a3c8da74126523fe1ca9336"
35+
"hash": "4277c625daca11ef1fe16ffe7670498b354baa72"
3336
},
3437
{
3538
"name": "score_bazel_platforms",

score_modules.MODULE.bazel

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

14-
# Generated from known_good.json at 2025-11-12T10:20:19Z
14+
# Generated from known_good.json at 2025-11-13T08:26:11Z
1515
# Do not edit manually - use tools/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",
2121
commit = "edc4f8841c2210d11ef310049a78644ff3d039a3",
22+
patches = [
23+
"//:wait_free_stack_fix.patch",
24+
],
25+
patch_strip = 1,
2226
)
2327

24-
bazel_dep(name = "score_communication")
28+
bazel_dep(name = "communication")
2529
git_override(
26-
module_name = "score_communication",
30+
module_name = "communication",
2731
remote = "https://github.com/eclipse-score/communication.git",
2832
commit = "ff40e5f1e90ce406b71c664cc6c8e902ab465305",
2933
)
@@ -46,14 +50,14 @@ bazel_dep(name = "score_tooling")
4650
git_override(
4751
module_name = "score_tooling",
4852
remote = "https://github.com/eclipse-score/tooling.git",
49-
commit = "b3a120a36c7a0e1b82d151732961af3330922e20",
53+
commit = "f36904e8c3d06c0ee761b14877ce7e5f6d3d9edb",
5054
)
5155

5256
bazel_dep(name = "score_platform")
5357
git_override(
5458
module_name = "score_platform",
5559
remote = "https://github.com/eclipse-score/score.git",
56-
commit = "6e2a756c5c52a6587a3c8da74126523fe1ca9336",
60+
commit = "4277c625daca11ef1fe16ffe7670498b354baa72",
5761
)
5862

5963
bazel_dep(name = "score_bazel_platforms")
@@ -74,7 +78,7 @@ bazel_dep(name = "score_docs_as_code")
7478
git_override(
7579
module_name = "score_docs_as_code",
7680
remote = "https://github.com/eclipse-score/docs-as-code.git",
77-
commit = "bb52c96dd98799bdce68c166ad3b826f017f7cf6",
81+
commit = "1067fb67782389b50827f8637a74b1027ece52ee",
7882
)
7983

8084
bazel_dep(name = "score_process")

tools/update_module_from_known_good.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def generate_git_override_blocks(modules, repo_commit_dict):
3939
name = module.get("name")
4040
repo = module.get("repo")
4141
commit = module.get("hash") or module.get("commit")
42+
patches = module.get("patches", [])
4243
if not name:
4344
logging.warning("Skipping module with missing name: %s", module)
4445
continue
@@ -49,6 +50,12 @@ def generate_git_override_blocks(modules, repo_commit_dict):
4950

5051
# Check if module has a version, use different logic
5152
version = module.get("version")
53+
patches_lines = ""
54+
if patches:
55+
patches_lines = " patches = [\n"
56+
for patch in patches:
57+
patches_lines += f' "{patch}",\n'
58+
patches_lines += " ],\n patch_strip = 1,\n"
5259

5360
if version:
5461
# If version is provided, use bazel_dep with single_version_override
@@ -57,6 +64,7 @@ def generate_git_override_blocks(modules, repo_commit_dict):
5764
'single_version_override(\n'
5865
f' module_name = "{name}",\n'
5966
f' version = "{version}",\n'
67+
f'{patches_lines}'
6068
')\n'
6169
)
6270
else:
@@ -68,13 +76,16 @@ def generate_git_override_blocks(modules, repo_commit_dict):
6876
if not re.match(r'^[a-fA-F0-9]{7,40}$', commit):
6977
logging.warning("Skipping module %s with invalid commit hash: %s", name, commit)
7078
continue
79+
7180
# If no version, use bazel_dep with git_override
81+
7282
block = (
7383
f'bazel_dep(name = "{name}")\n'
7484
'git_override(\n'
7585
f' module_name = "{name}",\n'
7686
f' remote = "{repo}",\n'
7787
f' commit = "{commit}",\n'
88+
f'{patches_lines}'
7889
')\n'
7990
)
8091

tools/update_module_latest.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class Module:
4949
hash: str
5050
repo: str
5151
version: str | None = None
52+
patches: list[str] | None = None
5253

5354
@property
5455
def owner_repo(self) -> str:
@@ -121,6 +122,8 @@ def write_known_good(path: str, original: dict, modules: list[Module]) -> None:
121122
out["modules"] = []
122123
for m in modules:
123124
mod_dict = {"name": m.name, "repo": m.repo, "hash": m.hash}
125+
if m.patches:
126+
mod_dict["patches"] = m.patches
124127
out["modules"].append(mod_dict)
125128
with open(path, "w", encoding="utf-8") as f:
126129
json.dump(out, f, indent=2, sort_keys=False)
@@ -158,11 +161,13 @@ def main(argv: list[str]) -> int:
158161
try:
159162
version = m.get("version")
160163
hash_val = m.get("hash", "")
164+
patches = m.get("patches")
161165
modules.append(Module(
162166
name=m["name"],
163167
hash=hash_val,
164168
repo=m["repo"],
165-
version=version
169+
version=version,
170+
patches=patches
166171
))
167172
except KeyError as e:
168173
print(f"WARNING: skipping module missing key {e}: {m}", file=sys.stderr)
@@ -193,7 +198,7 @@ def main(argv: list[str]) -> int:
193198
latest = fetch_latest_commit_gh(mod.owner_repo, args.branch)
194199
else:
195200
latest = fetch_latest_commit(mod.owner_repo, args.branch, token)
196-
updated.append(Module(name=mod.name, hash=latest, repo=mod.repo, version=mod.version))
201+
updated.append(Module(name=mod.name, hash=latest, repo=mod.repo, version=mod.version, patches=mod.patches))
197202

198203
# Display format: if version exists, show "version -> hash", otherwise "hash -> hash"
199204
if mod.version:

wait_free_stack_fix.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff --git a/score/mw/log/BUILD b/score/mw/log/BUILD
2+
--- a/score/mw/log/BUILD
3+
+++ b/score/mw/log/BUILD
4+
@@ -25,6 +25,7 @@ cc_library(
5+
visibility = ["//visibility:public"],
6+
deps = [
7+
":frontend",
8+
+ "//score/mw/log/detail/wait_free_stack:wait_free_stack",
9+
] + select({
10+
"@score_baselibs//score/mw/log/detail/flags:config_KUse_Stub_Implementation_Only": [
11+
"@score_baselibs//score/mw/log/detail:recorder_factory_stub",

0 commit comments

Comments
 (0)