From cd0d8fc4c22c438ccb4b0b3194aacfbad14ed454 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Mon, 16 Sep 2024 16:28:18 +0200 Subject: [PATCH] update --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59eca478..d55200e5 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.9 ->>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }} @@ -69,11 +65,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.9 ->>>>>>> 38ae4b7 (Fix broken rosidl_cli (#726)) with: use-ros2-testing: false required-ros-distributions: ${{ env.ROS_DISTRO }}