From 23edf9c7d6b570f7330e6f697d0b048b1d5fd539 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 da1e6665..dcae54c6 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.9 +======= + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -70,7 +74,11 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.9 +======= + - uses: ros-tooling/setup-ros@0.7.13 +>>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -219,7 +227,11 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} +<<<<<<< HEAD - uses: ros-tooling/setup-ros@0.7.9 +======= + - 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 2069702774ec9bbd51501899889cd90b13b330bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 3 Jun 2025 10:51:12 +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 dcae54c6..feef92c5 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.9 -======= - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -74,11 +70,7 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.9 -======= - 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,11 +219,7 @@ jobs: path: src/micro_ros_setup ref: ${{ inputs.ci_target_ref }} -<<<<<<< HEAD - - uses: ros-tooling/setup-ros@0.7.9 -======= - uses: ros-tooling/setup-ros@0.7.13 ->>>>>>> 262aa56 (Bump setup-ros (#777)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }}