File tree Expand file tree Collapse file tree 2 files changed +19
-0
lines changed
Expand file tree Collapse file tree 2 files changed +19
-0
lines changed Original file line number Diff line number Diff line change @@ -12,16 +12,28 @@ jobs:
1212 fail-fast : false
1313 matrix :
1414 include :
15+ <<<<<<< HEAD
1516 - docker_image : ubuntu:jammy
1617 ros_distribution : humble
18+ =======
19+ - docker_image : ubuntu:24.04
20+ ros_distribution : rolling
21+ >>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62))
1722 container :
1823 image : ${{ matrix.docker_image }}
1924 steps :
2025 - uses : actions/checkout@v3
26+ <<<<<<< HEAD
2127 - uses : ros-tooling/setup-ros@0.3.2
2228 with :
2329 required-ros-distributions : ${{ matrix.ros_distribution }}
2430 - uses : ros-tooling/action-ros-ci@0.2.5
31+ =======
32+ - uses : ros-tooling/setup-ros@0.7.13
33+ with :
34+ required-ros-distributions : ${{ matrix.ros_distribution }}
35+ - uses : ros-tooling/action-ros-ci@0.4.3
36+ >>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62))
2537 with :
2638 package-name : " micro_ros_utilities"
2739 target-ros2-distro : ${{ matrix.ros_distribution }}
Original file line number Diff line number Diff line change @@ -22,10 +22,17 @@ jobs:
2222 image : ${{ matrix.docker_image }}
2323 steps :
2424 - uses : actions/checkout@v3
25+ <<<<<<< HEAD
2526 - uses : ros-tooling/setup-ros@0.3.2
2627 with :
2728 required-ros-distributions : ${{ matrix.ros_distribution }}
2829 - uses : ros-tooling/action-ros-ci@0.2.5
30+ =======
31+ - uses : ros-tooling/setup-ros@0.7.13
32+ with :
33+ required-ros-distributions : ${{ matrix.ros_distribution }}
34+ - uses : ros-tooling/action-ros-ci@0.4.3
35+ >>>>>>> be7d012 (Bump setup-ros, action-ros-ci, and Ubuntu versions (#62))
2936 with :
3037 package-name : " micro_ros_utilities"
3138 target-ros2-distro : ${{ matrix.ros_distribution }}
You can’t perform that action at this time.
0 commit comments