From 93831395ebbeb3ea21ea61e7fc6ab6fac4b08a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:43:24 +0200 Subject: [PATCH 1/2] Bump setup-ros (#777) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas (cherry picked from commit 262aa56ef7773be9d6c4fc9d084cdcafb2b721ad) # Conflicts: # .github/workflows/ci.yml --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3a5be16..f0b48cfe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,11 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.0 +======= + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -72,7 +76,11 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.0 +======= + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -227,7 +235,11 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.0 +======= + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} From c6b772fea59e8f09598eedc294eccdb80428f536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:52:30 +0200 Subject: [PATCH 2/2] Merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas --- .github/workflows/ci.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0b48cfe..f36d07e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,11 +24,7 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.0 -======= - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -76,11 +72,7 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.0 -======= - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -235,11 +227,7 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.0 -======= - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }}