From cc9f8b6b4cc718da24f48491afbaeed840e766df Mon Sep 17 00:00:00 2001 From: David-LP99 Date: Mon, 17 Aug 2026 13:47:27 +0200 Subject: [PATCH 1/2] Update CI (#51) * Add CI and nightly for each distro (#43) * Update git version (#43) * Skip tests (#43) * Change nightly to weekly (#43) * Change master to rolling in fork checker (#43) * Update the CI for lyrical (#51) --------- Signed-off-by: Carlosespicur Signed-off-by: David Laseca (cherry picked from commit 1d8f9b9413743e2c04a264f24465ce29edfcf2cb) # Conflicts: # .github/workflows/fork_checker.yml # .github/workflows/reusable-ci.yml # .github/workflows/weekly-ci.yml --- .github/workflows/fork_checker.yml | 4 ++++ .github/workflows/lyrical-ci.yml | 16 ++++++++++++++++ .github/workflows/reusable-ci.yml | 8 ++++++++ .github/workflows/weekly-ci.yml | 10 ++++++++++ 4 files changed, 38 insertions(+) create mode 100644 .github/workflows/lyrical-ci.yml diff --git a/.github/workflows/fork_checker.yml b/.github/workflows/fork_checker.yml index 67fe8668..05d1a0f9 100644 --- a/.github/workflows/fork_checker.yml +++ b/.github/workflows/fork_checker.yml @@ -14,7 +14,11 @@ jobs: strategy: fail-fast: false matrix: +<<<<<<< HEAD branches: [humble, jazzy, kilted, rolling] +======= + branches: [humble, jazzy, kilted, lyrical, rolling] +>>>>>>> 1d8f9b9 (Update CI (#51)) steps: - name: Check id: check diff --git a/.github/workflows/lyrical-ci.yml b/.github/workflows/lyrical-ci.yml new file mode 100644 index 00000000..17c074f0 --- /dev/null +++ b/.github/workflows/lyrical-ci.yml @@ -0,0 +1,16 @@ +name: rcutils CI Lyrical + +on: + push: + branches: [ lyrical ] + pull_request: + branches: [ lyrical ] + +jobs: + lyrical-ci: + uses: ./.github/workflows/reusable-ci.yml + with: + branch: ${{ github.ref }} + os: ubuntu-26.04 + docker-image: ubuntu:resolute + ros-distribution: lyrical diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml index 1ac5f175..d97deac5 100644 --- a/.github/workflows/reusable-ci.yml +++ b/.github/workflows/reusable-ci.yml @@ -40,7 +40,11 @@ jobs: submodules: recursive - name: Setup ROS 2 +<<<<<<< HEAD uses: ros-tooling/setup-ros@0.7.15 +======= + uses: ros-tooling/setup-ros@0.7.19 +>>>>>>> 1d8f9b9 (Update CI (#51)) with: required-ros-distributions: ${{ inputs.ros-distribution }} @@ -49,7 +53,11 @@ jobs: apt-get install ros-${{ inputs.ros-distribution }}-mimick-vendor apt-get -y install ros-${{ inputs.ros-distribution }}-performance-test-fixture +<<<<<<< HEAD - uses : ros-tooling/action-ros-ci@0.4.5 +======= + - uses : ros-tooling/action-ros-ci@0.4.8 +>>>>>>> 1d8f9b9 (Update CI (#51)) with: package-name: "rcutils" target-ros2-distro: ${{ inputs.ros-distribution }} diff --git a/.github/workflows/weekly-ci.yml b/.github/workflows/weekly-ci.yml index 15fe99bd..07f30579 100644 --- a/.github/workflows/weekly-ci.yml +++ b/.github/workflows/weekly-ci.yml @@ -28,6 +28,16 @@ jobs: os: ubuntu-24.04 docker-image: ubuntu:noble ros-distribution: kilted +<<<<<<< HEAD +======= + lyrical-ci: + uses: ./.github/workflows/reusable-ci.yml + with: + branch: lyrical + os: ubuntu-26.04 + docker-image: ubuntu:resolute + ros-distribution: lyrical +>>>>>>> 1d8f9b9 (Update CI (#51)) rolling-ci: uses: ./.github/workflows/reusable-ci.yml with: From a8d1ad0c2f69e0ae2146fcb7f5cdc13c7f273f08 Mon Sep 17 00:00:00 2001 From: David Laseca Perez Date: Mon, 17 Aug 2026 13:56:38 +0200 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: David Laseca Perez --- .github/workflows/fork_checker.yml | 4 ---- .github/workflows/reusable-ci.yml | 8 -------- .github/workflows/weekly-ci.yml | 3 --- 3 files changed, 15 deletions(-) diff --git a/.github/workflows/fork_checker.yml b/.github/workflows/fork_checker.yml index 05d1a0f9..7a462451 100644 --- a/.github/workflows/fork_checker.yml +++ b/.github/workflows/fork_checker.yml @@ -14,11 +14,7 @@ jobs: strategy: fail-fast: false matrix: -<<<<<<< HEAD - branches: [humble, jazzy, kilted, rolling] -======= branches: [humble, jazzy, kilted, lyrical, rolling] ->>>>>>> 1d8f9b9 (Update CI (#51)) steps: - name: Check id: check diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml index d97deac5..98977e55 100644 --- a/.github/workflows/reusable-ci.yml +++ b/.github/workflows/reusable-ci.yml @@ -40,11 +40,7 @@ jobs: submodules: recursive - name: Setup ROS 2 -<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.15 -======= uses: ros-tooling/setup-ros@0.7.19 ->>>>>>> 1d8f9b9 (Update CI (#51)) with: required-ros-distributions: ${{ inputs.ros-distribution }} @@ -53,11 +49,7 @@ jobs: apt-get install ros-${{ inputs.ros-distribution }}-mimick-vendor apt-get -y install ros-${{ inputs.ros-distribution }}-performance-test-fixture -<<<<<<< HEAD - - uses : ros-tooling/action-ros-ci@0.4.5 -======= - uses : ros-tooling/action-ros-ci@0.4.8 ->>>>>>> 1d8f9b9 (Update CI (#51)) with: package-name: "rcutils" target-ros2-distro: ${{ inputs.ros-distribution }} diff --git a/.github/workflows/weekly-ci.yml b/.github/workflows/weekly-ci.yml index 07f30579..99a0a66f 100644 --- a/.github/workflows/weekly-ci.yml +++ b/.github/workflows/weekly-ci.yml @@ -28,8 +28,6 @@ jobs: os: ubuntu-24.04 docker-image: ubuntu:noble ros-distribution: kilted -<<<<<<< HEAD -======= lyrical-ci: uses: ./.github/workflows/reusable-ci.yml with: @@ -37,7 +35,6 @@ jobs: os: ubuntu-26.04 docker-image: ubuntu:resolute ros-distribution: lyrical ->>>>>>> 1d8f9b9 (Update CI (#51)) rolling-ci: uses: ./.github/workflows/reusable-ci.yml with: