Skip to content

Commit b2eb903

Browse files
4ntnmergify[bot]
authored andcommitted
Bump setup-ros, action-ros-ci, and Ubuntu versions (#62)
Signed-off-by: Antón Casas <antoncasas@eprosima.com> (cherry picked from commit be7d012) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml
1 parent ae51419 commit b2eb903

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff 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 }}

.github/workflows/nightly.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff 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 }}

0 commit comments

Comments
 (0)