Skip to content

Commit 9383139

Browse files
4ntnmergify[bot]
authored andcommitted
Bump setup-ros (#777)
Signed-off-by: Antón Casas <antoncasas@eprosima.com> (cherry picked from commit 262aa56) # Conflicts: # .github/workflows/ci.yml
1 parent b851ded commit 9383139

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ jobs:
2424
path: src/micro_ros_setup
2525
ref: ${{ inputs.ci_target_ref }}
2626

27+
<<<<<<< HEAD
2728
- uses: ros-tooling/setup-ros@0.7.0
29+
=======
30+
- uses: ros-tooling/setup-ros@0.7.13
31+
>>>>>>> 262aa56 (Bump setup-ros (#777))
2832
with:
2933
use-ros2-testing: false
3034
required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -72,7 +76,11 @@ jobs:
7276
path: src/micro_ros_setup
7377
ref: ${{ inputs.ci_target_ref }}
7478

79+
<<<<<<< HEAD
7580
- uses: ros-tooling/setup-ros@0.7.0
81+
=======
82+
- uses: ros-tooling/setup-ros@0.7.13
83+
>>>>>>> 262aa56 (Bump setup-ros (#777))
7684
with:
7785
use-ros2-testing: false
7886
required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -227,7 +235,11 @@ jobs:
227235
path: src/micro_ros_setup
228236
ref: ${{ inputs.ci_target_ref }}
229237

238+
<<<<<<< HEAD
230239
- uses: ros-tooling/setup-ros@0.7.0
240+
=======
241+
- uses: ros-tooling/setup-ros@0.7.13
242+
>>>>>>> 262aa56 (Bump setup-ros (#777))
231243
with:
232244
use-ros2-testing: false
233245
required-ros-distributions: ${{ env.ROS_DISTRO }}

0 commit comments

Comments
 (0)