From 8f394ff5bf2ca6d8a5520a00ef8ef0a9cf661d74 Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Fri, 9 Oct 2026 10:10:27 +0200 Subject: [PATCH 1/2] Add Lyrical to CI (#838) Signed-off-by: David Laseca Perez (cherry picked from commit 688d9cc1c433e40ce9916ac01b1447c17032c942) # Conflicts: # .github/workflows/nightly.yml --- .github/workflows/nightly.yml | 8 ++++++++ README.md | 1 + 2 files changed, 9 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dd424379..63c3b079 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,6 +10,14 @@ on: jobs: +<<<<<<< HEAD +======= + Lyrical: + uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@lyrical + with: + ci_target_ref: 'lyrical' + +>>>>>>> 688d9cc (Add Lyrical to CI (#838)) Kilted: uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@kilted with: diff --git a/README.md b/README.md index 45e4337d..28e7d577 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ This package targets the **ROS 2** installation. ROS 2 supported distributions a | Iron | EOL | `iron` | | Jazzy | Supported | `jazzy` | | Kilted | Supported | `kilted` | +| Lyrical | Supported | `lyrical` | | Rolling | Supported | `rolling` | Some other prerequisites needed for building a firmware using this package are: From f3fe8fab7656582d8c09c7cd156401f47425e5f0 Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Fri, 9 Oct 2026 12:08:44 +0200 Subject: [PATCH 2/2] Fix conflict Signed-off-by: David Laseca Perez --- .github/workflows/nightly.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 63c3b079..8dd5bb14 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,14 +10,11 @@ on: jobs: -<<<<<<< HEAD -======= Lyrical: uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@lyrical with: ci_target_ref: 'lyrical' ->>>>>>> 688d9cc (Add Lyrical to CI (#838)) Kilted: uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@kilted with: