Merge branch 'main' into feature/itf-int-local

Author: MaciejKaszynski

.bazelrc

@@ -51,7 +51,12 @@ build:x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux
 build:x86_64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_x86_64_unknown_linux_gnu
 build:x86_64-linux --define config=x86_64-linux
 
-# TODO arm64-linux when rust support is there
+# Target configuration for CPU:AArch64|OS:Linux build (do not use it in case of system toolchains!)
+build:arm64-linux --config=stub
+build:arm64-linux --config=toolchain_common
+build:arm64-linux --platforms=@score_bazel_platforms//:aarch64-linux-gcc_12.2.0-posix
+build:arm64-linux --extra_toolchains=@score_gcc_aarch64_toolchain//:aarch64-linux-gcc_12.2.0-posix
+build:arm64-linux --extra_toolchains=@score_toolchains_rust//toolchains/ferrocene:ferrocene_aarch64_unknown_linux_gnu
 
 # Target configuration for CPU:x86-64|OS:QNX build (do not use it in case of system toolchains!)
 build:x86_64-qnx --config=stub

.github/workflows/build.yml

@@ -22,8 +22,10 @@ on:
       - main
 jobs:
   build:
-    name: Build Bazel Code
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config: [x86_64-linux, arm64-linux]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4.2.2
@@ -32,7 +34,7 @@ jobs:
         uses: bazel-contrib/setup-bazel@0.18.0
         with:
           bazelisk-cache: true
-          disk-cache: ${{ github.workflow }}
+          disk-cache: ${{ github.workflow }}-${{ matrix.config }}
           repository-cache: true
           cache-save: ${{ github.event_name == 'push' }}
 
@@ -46,4 +48,4 @@ jobs:
 
       - name: Build with Bazel
         run: |
-          bazel build --lockfile_mode=error --config x86_64-linux //src/... //examples/...
+          bazel build --lockfile_mode=error --config ${{ matrix.config }} //src/... //examples/...

MODULE.bazel

@@ -79,13 +79,13 @@ use_repo(
 )
 
 ## Rust Toolchain
-bazel_dep(name = "score_toolchains_rust", version = "0.4.0", dev_dependency = True)
+bazel_dep(name = "score_toolchains_rust", version = "0.8.0", dev_dependency = True)
 
 # S-CORE crates
 bazel_dep(name = "score_crates", version = "0.0.8")
 git_override(
     module_name = "score_crates",
-    commit = "c56d8f4006ff1cfe5be532496225255c5ee6c2d6",
+    commit = "90539da0fd3e7e23e01f2b4de1679f7dfadd3b6b",
     remote = "https://github.com/eclipse-score/score-crates.git",
 )
 
@@ -125,13 +125,14 @@ python.toolchain(
     python_version = PYTHON_VERSION,
 )
 
-pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True)
+# Python pip dependencies
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
-    hub_name = "pip_score_venv_test",
+    hub_name = "score_lifecycle_pip",
     python_version = PYTHON_VERSION,
-    requirements_lock = "//tests/integration:requirements.lock",
+    requirements_lock = "//:requirements_lock.txt",
 )
-use_repo(pip, "pip_score_venv_test")
+use_repo(pip, "score_lifecycle_pip")
 
 bazel_dep(name = "score_itf", version = "0.1.0", dev_dependency = True)
 
@@ -142,7 +143,7 @@ oci.pull(
     tag = "bookworm",
     platforms = ["linux/amd64"],
 )
-use_repo(oci, "linux_runtime")
+use_repo(oci, "linux_runtime", "linux_runtime_linux_amd64")
 
 local_path_override(
     module_name = "score_itf",

MODULE.bazel.lock

@@ -10,10 +10,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
-def get_process_index_range(process_count: int, process_group_index: int):
-    # Every ProcessGroup gets the same number of processes
-    # The Process Index is a globally unique increasing number
-    return range(
-        process_group_index * process_count,
-        (process_group_index * process_count) + process_count,
-    )
+
+"""Unified entrypoint for lifecycle Bazel macros & rules."""
+
+# --- Launch Manager Configuration ---
+load("//scripts/config_mapping:config.bzl", _launch_manager_config = "launch_manager_config")
+
+launch_manager_config = _launch_manager_config

examples/config/gen_common_cfg.py defs.bzlexamples/config/gen_common_cfg.py renamed to defs.bzl

@@ -0,0 +1,49 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+load("//:defs.bzl", "launch_manager_config")
+
+launch_manager_config(
+    name = "example_config",
+    config = "//examples/config:lifecycle_demo_config",
+)
+
+filegroup(
+    name = "example_apps",
+    srcs = [
+        "//examples:example_config",
+        "//examples/control_application:control_daemon",
+        "//examples/control_application:lmcontrol",
+        "//examples/cpp_lifecycle_app",
+        "//examples/cpp_supervised_app",
+        "//examples/rust_supervised_app",
+    ],
+)
+
+filegroup(
+    name = "lm_binaries",
+    srcs = [
+        "//src/control_client_lib",
+        "//src/launch_manager_daemon:launch_manager",
+        "//src/launch_manager_daemon/lifecycle_client_lib:lifecycle_client",
+        "//src/launch_manager_daemon/process_state_client_lib:process_state_client",
+    ],
+)
+
+sh_binary(
+    name = "run_examples",
+    srcs = ["run.sh"],
+    data = [
+        ":example_apps",
+        ":lm_binaries",
+    ],
+)

examples/BUILD

@@ -2,23 +2,20 @@
 
 ## Building & Running the demo setup
 
-1. Build launch_manager and health_monitor, in the parent folder, first.
-2. Then start run.sh script in this folder: `cd demo && ./run.sh`
+Execute `bazel run //examples:run_examples --config=<...>`. This will build all dependences and run the run.sh script
 
 The run.sh script will:
 
-- Copy the required binaries to a temporary directory demo/tmp
-- Compile the json configuration to flatbuffer using flatc
 - Build a docker image for execution with the required artifacts inside
 - Start the docker container that runs launch_manager
 
 ## Interacting with the Demo
 
-### Changing ProcessGroup States
+### Changing RunTargets
 
-There is a CLI application that allows to request transition to a certain ProcessGroup State.
+There is a CLI application that allows to request transition to a certain RunTarget.
 
-Example: `lmcontrol ProcessGroup1/Startup`
+Example: `lmcontrol Startup`
 
 ### Triggering Supervision Failure
 
@@ -31,4 +28,4 @@ Example: `fail <PID>`
 There is an interactive mode that walks you through two demo scenarios.
 This mode requires the run.sh script to be executed **in an active tmux** session.
 
-`cd demo && ./run.sh tmux`
+`bazel run //examples:run_examples --config=<...> -- tmux`

examples/README.md

@@ -0,0 +1,22 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+exports_files(
+    ["lifecycle_demo.json"],
+    visibility = ["//examples:__subpackages__"],
+)
+
+filegroup(
+    name = "lifecycle_demo_config",
+    srcs = ["lifecycle_demo.json"],
+    visibility = ["//examples:__subpackages__"],
+)