Skip to content

Commit 0fc3f23

Browse files
authored
Bump setup-ros action in CI to support Ubuntu Jammy (#170)
* Bump setup-ros action in CI to support Ubuntu Jammy Signed-off-by: Evan Flynn <[email protected]> * Include humble in ros_distribution list in CI * Skip humble for now since setup-ros docker image not available yet Signed-off-by: Evan Flynn <[email protected]> * Use ros_distribution instead of ros_distro variable in CI Signed-off-by: Evan Flynn <[email protected]>
1 parent edddb8e commit 0fc3f23

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.github/workflows/rust.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ jobs:
1313
build:
1414
strategy:
1515
matrix:
16-
ros_distro: [rolling, foxy, galactic]
16+
ros_distribution:
17+
- foxy
18+
- galactic
19+
# - humble
20+
- rolling
1721
include:
1822
# Foxy Fitzroy (June 2020 - May 2023)
1923
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
@@ -24,9 +28,9 @@ jobs:
2428
ros_distribution: galactic
2529
ros_version: 2
2630
# Humble Hawksbill (May 2022 - May 2027)
27-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
28-
ros_distribution: humble
29-
ros_version: 2
31+
# - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
32+
# ros_distribution: humble
33+
# ros_version: 2
3034
# Rolling Ridley (June 2020 - Present)
3135
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
3236
ros_distribution: rolling
@@ -43,9 +47,9 @@ jobs:
4347
echo ::set-output name=package_list::$(colcon list --names-only)
4448
4549
- name: Setup ROS environment
46-
uses: ros-tooling/setup-ros@v0.2
50+
uses: ros-tooling/setup-ros@v0.3
4751
with:
48-
required-ros-distributions: ${{ matrix.ros_distro }}
52+
required-ros-distributions: ${{ matrix.ros_distribution }}
4953

5054
- name: Setup Rust
5155
uses: actions-rs/toolchain@v1
@@ -77,13 +81,13 @@ jobs:
7781
uses: ros-tooling/[email protected]
7882
with:
7983
package-name: ${{ steps.list_packages.outputs.package_list }}
80-
target-ros2-distro: ${{ matrix.ros_distro }}
81-
vcs-repo-file-url: ros2_rust_${{ matrix.ros_distro }}.repos
84+
target-ros2-distro: ${{ matrix.ros_distribution }}
85+
vcs-repo-file-url: ros2_rust_${{ matrix.ros_distribution }}.repos
8286

8387
- name: Run clippy on Rust packages
8488
run: |
8589
cd ${{ steps.build.outputs.ros-workspace-directory-name }}
86-
. /opt/ros/${{ matrix.ros_distro }}/setup.sh
90+
. /opt/ros/${{ matrix.ros_distribution }}/setup.sh
8791
for path in $(colcon list | awk '$3 == "(ament_cargo)" { print $2 }'); do
8892
cd $path
8993
echo "Running clippy in $path"
@@ -94,7 +98,7 @@ jobs:
9498
- name: Rustdoc check
9599
run: |
96100
cd ${{ steps.build.outputs.ros-workspace-directory-name }}
97-
. /opt/ros/${{ matrix.ros_distro }}/setup.sh
101+
. /opt/ros/${{ matrix.ros_distribution }}/setup.sh
98102
for path in $(colcon list | awk '$3 == "(ament_cargo)" && $1 != "examples_rclrs_minimal_pub_sub" { print $2 }'); do
99103
cd $path
100104
echo "Running rustdoc check in $path"

0 commit comments

Comments
 (0)