Skip to content

Commit

Permalink
Updated ros2 CI workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
matlabbe committed Dec 1, 2024
1 parent 3f6adad commit 5c81b95
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/docker-ros2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
docker_tag: [humble, humble-latest, iron, iron-latest, jazzy-latest]
docker_tag: [humble, humble-latest, jazzy, jazzy-latest]
include:
- docker_tag: humble
docker_path: 'humble'
Expand All @@ -22,19 +22,11 @@ jobs:
docker_platforms: |
linux/amd64
linux/arm64
- docker_tag: iron
docker_path: 'iron'
- docker_tag: jazzy
docker_path: 'jazzy'
docker_platforms: |
linux/amd64
- docker_tag: iron-latest
docker_path: 'iron/latest'
docker_platforms: |
linux/amd64
# Re-add "jazzy" after binaries are released
# - docker_tag: jazzy
# docker_path: 'jazzy'
# docker_platforms: |
# linux/amd64
linux/arm64
- docker_tag: jazzy-latest
docker_path: 'jazzy/latest'
docker_platforms: |
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/ros2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ros2

on:
push:
branches: [ ros2 ]
branches: [ ros2, humble-devel, jazzy-devel]
pull_request:
branches: [ ros2 ]

Expand All @@ -21,15 +21,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ros_distro: [humble, iron]
ros_distro: [humble, jazzy]
include:
- ros_distro: 'humble'
ubuntu_distro: 'jammy'
- ros_distro: 'iron'
ubuntu_distro: 'jammy'
# Disabled as there still missing dependencies on jazzy:
# - ros_distro: 'jazzy'
# ubuntu_distro: 'noble'
- ros_distro: 'jazzy'
ubuntu_distro: 'noble'
fail-fast: false
container:
image: rostooling/setup-ros-docker:ubuntu-${{ matrix.ubuntu_distro }}-ros-${{ matrix.ros_distro }}-desktop-latest
Expand Down

0 comments on commit 5c81b95

Please sign in to comment.