Skip to content

Commit 23edf9c

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 2340dca commit 23edf9c

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.9
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 }}
@@ -70,7 +74,11 @@ jobs:
7074
path: src/micro_ros_setup
7175
ref: ${{ inputs.ci_target_ref }}
7276

77+
<<<<<<< HEAD
7378
- uses: ros-tooling/setup-ros@0.7.9
79+
=======
80+
- uses: ros-tooling/setup-ros@0.7.13
81+
>>>>>>> 262aa56 (Bump setup-ros (#777))
7482
with:
7583
use-ros2-testing: false
7684
required-ros-distributions: ${{ env.ROS_DISTRO }}
@@ -219,7 +227,11 @@ jobs:
219227
path: src/micro_ros_setup
220228
ref: ${{ inputs.ci_target_ref }}
221229

230+
<<<<<<< HEAD
222231
- uses: ros-tooling/setup-ros@0.7.9
232+
=======
233+
- uses: ros-tooling/setup-ros@0.7.13
234+
>>>>>>> 262aa56 (Bump setup-ros (#777))
223235
with:
224236
use-ros2-testing: false
225237
required-ros-distributions: ${{ env.ROS_DISTRO }}

0 commit comments

Comments
 (0)