add capability to pin modules to branches

Author: kgraeper

.bazelrc

@@ -20,7 +20,7 @@ common --registry=https://bcr.bazel.build
 build --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
 build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
 build --@score_baselibs//score/json:base_library=nlohmann
-build --@communication//score/mw/com/flags:tracing_library=stub
+build --@score_communication//score/mw/com/flags:tracing_library=stub
 
 # stop legacy behavior of creating __init__.py files
 build --incompatible_default_to_explicit_init_py

.github/workflows/test_integration.yml

@@ -17,8 +17,9 @@
 name: build latest mains
 on:
   workflow_dispatch:
-  push:
   pull_request:
+  schedule:
+    - cron: '30 2 * * *'  # Every night at 02:30 UTC on main branch
 jobs:
     integration_test:
       runs-on: ubuntu-latest
@@ -53,7 +54,7 @@ jobs:
             repository-cache: true
         - name: Update known good commits
           run: |
-            echo "::group::get latest commits from main branches"
+            echo "::group::get latest commits from module branches"
             python3 tools/update_module_latest.py --output known_good.updated.json
             cat known_good.updated.json
             echo "::endgroup::"

MODULE.bazel

@@ -47,13 +47,15 @@ use_repo(pip, "pip_score_venv_test")
 
 # communication module dependencies
 # archive_override are not forwarded by bazel_dep, so we need to redefine it here
-# archive_override(
-#     module_name = "rules_boost",
-#     strip_prefix = "rules_boost-master",
-#     urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
-# )
+bazel_dep(name = "rules_boost", repo_name = "com_github_nelhage_rules_boost")
+archive_override(
+    module_name = "rules_boost",
+    strip_prefix = "rules_boost-master",
+    urls = ["https://github.com/nelhage/rules_boost/archive/refs/heads/master.tar.gz"],
+)
 
 # git_override are not forwarded by bazel_dep, so we need to redefine it here
+bazel_dep(name = "trlc")
 git_override(
     module_name = "trlc",
     remote = "https://github.com/bmw-software-engineering/trlc.git",

integration_test.sh

@@ -12,6 +12,17 @@ LOG_DIR=${LOG_DIR:-_logs/logs}
 SUMMARY_FILE=${SUMMARY_FILE:-_logs/build_summary.md}
 KNOWN_GOOD_FILE=""
 
+# maybe move this to known_good.json or a config file later
+declare -A BUILD_TARGET_GROUPS=(
+    [score_baselibs]="@score_baselibs//score/..."
+    [score_communication]="@score_communication//score/mw/com:com"
+    [score_persistency]="@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
+    #[score_logging]="@score_logging//src/..."
+    [score_orchestrator]="@score_orchestrator//src/..."
+    [score_test_scenarios]="@score_test_scenarios//..."
+    [score_feo]="@score_feo//..."
+)
+
 # Parse command line arguments
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -63,16 +74,6 @@ get_module_repo() {
     python3 "${script_dir}/tools/get_module_info.py" "${known_good_file}" "${module_name}" "repo" 2>/dev/null || echo "N/A"
 }
 
-declare -A BUILD_TARGET_GROUPS=(
-    [score_baselibs]="@score_baselibs//score/..."
-    [communication]="@communication//score/mw/com:com"
-    [score_persistency]="@score_persistency//src/cpp/src/... @score_persistency//src/rust/..."
-    #[score_logging]="@score_logging//src/..."
-    [score_orchestrator]="@score_orchestrator//src/..."
-    [score_test_scenarios]="@score_test_scenarios//..."
-    [score_feo]="@score_feo//..."
-)
-
 warn_count() {
     # Grep typical compiler and Bazel warnings; adjust patterns as needed.
     local file=$1

known_good.json

@@ -4,13 +4,12 @@
         "score_baselibs": {
             "version": "0.1.3",
             "repo": "https://github.com/eclipse-score/baselibs.git",
-            "patches": [
-                "//:wait_free_stack_fix.patch"
-            ]
+            "branch": "s_core_release_v0_5_0"
         },
-        "communication": {
+        "score_communication": {
             "version": "0.1.1",
-            "repo": "https://github.com/eclipse-score/communication.git"
+            "repo": "https://github.com/eclipse-score/communication.git",
+            "branch": "s_core_release_v0_5_0"
         },
         "score_persistency": {
             "version": "0.2.1",
@@ -43,6 +42,11 @@
         "score_process": {
             "version": "1.3.1",
             "repo": "https://github.com/eclipse-score/process_description.git"
+        },
+        "score_feo": {
+            "version": "1.0.2",
+            "repo": "https://github.com/eclipse-score/feo.git",
+            "branch": "candidate_v0.5"
         }
     },
     "manifest_sha256": "4c9b7f...",

known_good.updated.json

@@ -1,32 +1,34 @@
 {
-    "timestamp": "2025-11-13T10:12:42Z",
+    "timestamp": "2025-11-25T12:05:14Z",
     "modules": {
         "score_baselibs": {
             "repo": "https://github.com/eclipse-score/baselibs.git",
-            "hash": "edc4f8841c2210d11ef310049a78644ff3d039a3",
+            "hash": "9457533471c8f0d4a1bb9435e91ff12c62d19c7c",
             "patches": [
                 "//:wait_free_stack_fix.patch"
-            ]
+            ],
+            "branch": "s_core_release_v0_5_0"
         },
-        "communication": {
+        "score_communication": {
             "repo": "https://github.com/eclipse-score/communication.git",
-            "hash": "ff40e5f1e90ce406b71c664cc6c8e902ab465305"
+            "hash": "24d6e8916b89dbb405eae0b082348645d190dc18",
+            "branch": "s_core_release_v0_5_0"
         },
         "score_persistency": {
             "repo": "https://github.com/eclipse-score/persistency.git",
-            "hash": "7548876ed3e40ec3f3053c57634de68129287e05"
+            "hash": "6f20545e0bbe90fcc36a0c6783e91a4fd867b110"
         },
         "score_orchestrator": {
             "repo": "https://github.com/eclipse-score/orchestrator.git",
-            "hash": "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6"
+            "hash": "acd3cb614d2f97c2e140c776923c8c6623969691"
         },
         "score_tooling": {
             "repo": "https://github.com/eclipse-score/tooling.git",
-            "hash": "654664dae7df2700fd5840c5ed6c07ac6c61705d"
+            "hash": "8f025ef11f5ad3ea5b02fdff338a75cbac655ec4"
         },
         "score_platform": {
             "repo": "https://github.com/eclipse-score/score.git",
-            "hash": "4277c625daca11ef1fe16ffe7670498b354baa72"
+            "hash": "0d5e37a60ac63a8f2265660f917f7184a6763a48"
         },
         "score_bazel_platforms": {
             "repo": "https://github.com/eclipse-score/bazel_platforms.git",
@@ -38,11 +40,16 @@
         },
         "score_docs_as_code": {
             "repo": "https://github.com/eclipse-score/docs-as-code.git",
-            "hash": "1067fb67782389b50827f8637a74b1027ece52ee"
+            "hash": "7e747c91521417c56289eb33b55c33dd1f8e9c77"
         },
         "score_process": {
             "repo": "https://github.com/eclipse-score/process_description.git",
-            "hash": "e62e4c30808436e790590845f6c297cf605d7649"
+            "hash": "3bafefc8e81febdaf8e0468716ec2f81d3c12717"
+        },
+        "score_feo": {
+            "repo": "https://github.com/eclipse-score/feo.git",
+            "hash": "4841281ab81aad114cfc86a19a69c029a274f28d",
+            "branch": "candidate_v0.5"
         }
     },
     "manifest_sha256": "4c9b7f...",

score_modules.MODULE.bazel

@@ -11,52 +11,49 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-# Generated from known_good.json at 2025-11-13T08:26:11Z
+# Generated from known_good.json at 2025-11-25T12:05:14Z
 # Do not edit manually - use tools/update_module_from_known_good.py
 
 bazel_dep(name = "score_baselibs")
 git_override(
     module_name = "score_baselibs",
     remote = "https://github.com/eclipse-score/baselibs.git",
-    commit = "edc4f8841c2210d11ef310049a78644ff3d039a3",
-    patches = [
-        "//:wait_free_stack_fix.patch",
-    ],
-    patch_strip = 1,
+    commit = "9457533471c8f0d4a1bb9435e91ff12c62d19c7c",
 )
 
-bazel_dep(name = "communication")
+bazel_dep(name = "score_communication")
 git_override(
-    module_name = "communication",
+    module_name = "score_communication",
     remote = "https://github.com/eclipse-score/communication.git",
-    commit = "ff40e5f1e90ce406b71c664cc6c8e902ab465305",
+    commit = "24d6e8916b89dbb405eae0b082348645d190dc18",
 )
 
 bazel_dep(name = "score_persistency")
 git_override(
     module_name = "score_persistency",
     remote = "https://github.com/eclipse-score/persistency.git",
-    commit = "7548876ed3e40ec3f3053c57634de68129287e05",
+    commit = "6f20545e0bbe90fcc36a0c6783e91a4fd867b110",
 )
 
 bazel_dep(name = "score_orchestrator")
 git_override(
     module_name = "score_orchestrator",
     remote = "https://github.com/eclipse-score/orchestrator.git",
-    commit = "7bb94ebae08805ea0a83dcc14f7c17da5ab927e6",
+    commit = "acd3cb614d2f97c2e140c776923c8c6623969691",
 )
 
 bazel_dep(name = "score_tooling")
 git_override(
     module_name = "score_tooling",
     remote = "https://github.com/eclipse-score/tooling.git",
-    commit = "f36904e8c3d06c0ee761b14877ce7e5f6d3d9edb",
+    commit = "8f025ef11f5ad3ea5b02fdff338a75cbac655ec4",
 )
 
 bazel_dep(name = "score_platform")
-single_version_override(
+git_override(
     module_name = "score_platform",
-    version = "0.4.2",
+    remote = "https://github.com/eclipse-score/score.git",
+    commit = "0d5e37a60ac63a8f2265660f917f7184a6763a48",
 )
 
 bazel_dep(name = "score_bazel_platforms")
@@ -77,19 +74,19 @@ bazel_dep(name = "score_docs_as_code")
 git_override(
     module_name = "score_docs_as_code",
     remote = "https://github.com/eclipse-score/docs-as-code.git",
-    commit = "1067fb67782389b50827f8637a74b1027ece52ee",
+    commit = "7e747c91521417c56289eb33b55c33dd1f8e9c77",
 )
 
 bazel_dep(name = "score_process")
 git_override(
     module_name = "score_process",
     remote = "https://github.com/eclipse-score/process_description.git",
-    commit = "ea78e6d616adf1f13236c31479a31db813086a77",
+    commit = "3bafefc8e81febdaf8e0468716ec2f81d3c12717",
 )
 
-bazel_dep(name = "score_feo", version = "1.0.2")
-single_version_override(
+bazel_dep(name = "score_feo")
+git_override(
     module_name = "score_feo",
-    version = "1.0.2",
+    remote = "https://github.com/eclipse-score/feo.git",
+    commit = "4841281ab81aad114cfc86a19a69c029a274f28d",
 )
-

tools/update_module_latest.py

@@ -50,6 +50,7 @@ class Module:
 	repo: str
 	version: str | None = None
 	patches: list[str] | None = None
+	branch: str = "main"
 
 	@property
 	def owner_repo(self) -> str:
@@ -124,6 +125,8 @@ def write_known_good(path: str, original: dict, modules: list[Module]) -> None:
 		mod_dict = {"repo": m.repo, "hash": m.hash}
 		if m.patches:
 			mod_dict["patches"] = m.patches
+		if m.branch:
+			mod_dict["branch"] = m.branch
 		out["modules"][m.name] = mod_dict
 	with open(path, "w", encoding="utf-8") as f:
 		json.dump(out, f, indent=4, sort_keys=False)
@@ -163,6 +166,7 @@ def main(argv: list[str]) -> int:
 			hash_val = m.get("hash", "")
 			patches = m.get("patches")
 			repo = m.get("repo")
+			branch = m.get("branch")
 			if not repo:
 				print(f"WARNING: skipping module {name} with missing repo", file=sys.stderr)
 				continue
@@ -171,7 +175,8 @@ def main(argv: list[str]) -> int:
 				hash=hash_val,
 				repo=repo,
 				version=version,
-				patches=patches
+				patches=patches,
+				branch=branch
 			))
 		except KeyError as e:
 			print(f"WARNING: skipping module {name} missing key {e}: {m}", file=sys.stderr)
@@ -198,17 +203,19 @@ def main(argv: list[str]) -> int:
 
 	for mod in modules:
 		try:
+			# Use module-specific branch if available, otherwise use command-line branch
+			branch = mod.branch if mod.branch else args.branch
 			if use_gh:
-				latest = fetch_latest_commit_gh(mod.owner_repo, args.branch)
+				latest = fetch_latest_commit_gh(mod.owner_repo, branch)
 			else:
-				latest = fetch_latest_commit(mod.owner_repo, args.branch, token)
-			updated.append(Module(name=mod.name, hash=latest, repo=mod.repo, version=mod.version, patches=mod.patches))
+				latest = fetch_latest_commit(mod.owner_repo, branch, token)
+			updated.append(Module(name=mod.name, hash=latest, repo=mod.repo, version=mod.version, patches=mod.patches, branch=mod.branch))
 
 			# Display format: if version exists, show "version -> hash", otherwise "hash -> hash"
 			if mod.version:
-				print(f"{mod.name}: {mod.version} -> {latest[:8]} (branch {args.branch})")
+				print(f"{mod.name}: {mod.version} -> {latest[:8]} (branch {branch})")
 			else:
-				print(f"{mod.name}: {mod.hash[:8]} -> {latest[:8]} (branch {args.branch})")
+				print(f"{mod.name}: {mod.hash[:8]} -> {latest[:8]} (branch {branch})")
 		except Exception as e:  # noqa: BLE001
 			failures += 1
 			print(f"ERROR {mod.name}: {e}", file=sys.stderr)