File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -22,16 +22,25 @@ jobs:
2222 container :
2323 image : ubuntu:jammy
2424 steps :
25+ <<<<<<< HEAD
2526 - uses : actions/checkout@v3
2627 - uses : ros-tooling/setup-ros@0.7.1
28+ =======
29+ - uses : actions/checkout@v4
30+ - uses : ros-tooling/setup-ros@0.7.13
31+ >>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249))
2732 with :
2833 use-ros2-testing : false
2934 required-ros-distributions : ${{ matrix.ros_distribution }}
3035 - name : Download and install dependencies
3136 run : |
3237 apt-get install ros-${{ matrix.ros_distribution }}-micro-ros-msgs
3338 apt-get install ros-${{ matrix.ros_distribution }}-rmw-fastrtps-cpp
39+ <<<<<<< HEAD
3440 - uses : ros-tooling/action-ros-ci@0.3.6
41+ =======
42+ - uses : ros-tooling/action-ros-ci@0.4.3
43+ >>>>>>> 0e6e8e3 (Bump setup-ros and action-ros-ci (#249))
3544 with :
3645 package-name : " micro_ros_agent"
3746 target-ros2-distro : ${{ matrix.ros_distribution }}
You can’t perform that action at this time.
0 commit comments