Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bazel_common/docs_bundles.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ DOCS_BUNDLES = [
"bundle": "@score_logging//:docs_bundle",
"mount_at": "modules/score_logging",
},
{
"bundle": "@score_time//:docs_bundle",
"mount_at": "modules/score_time",
},
{
"bundle": "@score_itf//:docs_bundle",
"mount_at": "process_methods_tools/score_itf",
Expand Down
6 changes: 5 additions & 1 deletion bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ git_override(
bazel_dep(name = "score_time")
git_override(
module_name = "score_time",
commit = "310c9b63bc21fdc85df840fb8ee400a610667038",
commit = "3723ce687e4abc7d6cb4c0efdbbd30455ed7c303",
patch_strip = 1,
patches = [
"//patches/time:003-disable-broken-qnx-ifs-target.patch",
],
remote = "https://github.com/eclipse-score/time.git",
)

Expand Down
7 changes: 4 additions & 3 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,10 @@
},
"score_time": {
"repo": "https://github.com/eclipse-score/time.git",
"docs": false,
"hash": "310c9b63bc21fdc85df840fb8ee400a610667038",
"bazel_patches": [],
"hash": "3723ce687e4abc7d6cb4c0efdbbd30455ed7c303",
"bazel_patches": [
"//patches/time:003-disable-broken-qnx-ifs-target.patch"
],
"metadata": {
"code_root_path": "//score/...",
"extra_test_config": [],
Expand Down
24 changes: 24 additions & 0 deletions patches/time/003-disable-broken-qnx-ifs-target.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/score/time_slave/tests/reference_integration/qnx/BUILD b/score/time_slave/tests/reference_integration/qnx/BUILD
--- a/score/time_slave/tests/reference_integration/qnx/BUILD
+++ b/score/time_slave/tests/reference_integration/qnx/BUILD
@@ -13,5 +13,4 @@

load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files", "strip_prefix")
-load("@score_rules_imagefs//rules/qnx:ifs.bzl", "qnx_ifs")

pkg_files(
@@ -32,14 +31,1 @@
)
-
-qnx_ifs(
- name = "ifs",
- srcs = [
- ":time_slave_bin",
- ":time_slave_etc",
- ],
- build_file = "init.build",
- extra_build_files = ["tools.build"],
- tags = ["manual"],
- target_compatible_with = ["@platforms//os:qnx"],
- visibility = ["//visibility:public"],
-)
Empty file added patches/time/BUILD
Empty file.
17 changes: 17 additions & 0 deletions scripts/known_good/update_module_from_known_good.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,23 @@ def main() -> None:
generated_files.append(output_path_coverage)
print(f"Generated {output_path_coverage}")

# Generate docs_bundles.bzl once, covering every group's documentation mounts.
content_docs_bundles = generate_docs_bundles_content(known_good, known_good.timestamp)
output_dir_docs_bundles = os.path.abspath(args.output_dir_docs_bundles)
output_path_docs_bundles = os.path.join(output_dir_docs_bundles, "docs_bundles.bzl")

if args.dry_run:
print(f"\nDry run: would write to {output_path_docs_bundles}\n")
print("---- BEGIN GENERATED CONTENT FOR DOCS BUNDLES ----")
print(content_docs_bundles)
print("---- END GENERATED CONTENT FOR DOCS BUNDLES ----")
else:
os.makedirs(output_dir_docs_bundles, exist_ok=True)
with open(output_path_docs_bundles, "w", encoding="utf-8") as f:
f.write(content_docs_bundles)
generated_files.append(output_path_docs_bundles)
print(f"Generated {output_path_docs_bundles}")

if not args.dry_run and generated_files:
print(f"\nSuccessfully generated {len(generated_files)} file(s) with {total_module_count} total modules")

Expand Down
Loading