diff --git a/bazel_common/docs_bundles.bzl b/bazel_common/docs_bundles.bzl index 3f41d506650..cdf7d1100ff 100644 --- a/bazel_common/docs_bundles.bzl +++ b/bazel_common/docs_bundles.bzl @@ -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", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 52ba2aa699a..96c595bd41f 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -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", ) diff --git a/known_good.json b/known_good.json index 8024415c01a..5e93c31024a 100644 --- a/known_good.json +++ b/known_good.json @@ -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": [], diff --git a/patches/time/003-disable-broken-qnx-ifs-target.patch b/patches/time/003-disable-broken-qnx-ifs-target.patch new file mode 100644 index 00000000000..6658f3ea99f --- /dev/null +++ b/patches/time/003-disable-broken-qnx-ifs-target.patch @@ -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"], +-) diff --git a/patches/time/BUILD b/patches/time/BUILD new file mode 100644 index 00000000000..e69de29bb2d diff --git a/scripts/known_good/update_module_from_known_good.py b/scripts/known_good/update_module_from_known_good.py index 39ab1218f25..8f8b22241ac 100755 --- a/scripts/known_good/update_module_from_known_good.py +++ b/scripts/known_good/update_module_from_known_good.py @@ -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")