Skip to content

Commit a16f3b8

Browse files
Touchup CI 🧹 (#145)
1 parent 136d580 commit a16f3b8

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ on:
44
workflow_dispatch:
55
pull_request:
66
push:
7+
branches:
8+
- main
79

810
jobs:
911
cmake:
1012
name: cmake (${{ matrix.ros_distro }}, ${{ matrix.preset }}, ${{ matrix.compiler.name }})
1113
strategy:
1214
fail-fast: false
1315
matrix:
14-
ros_distro: [humble, rolling]
16+
ros_distro: [humble, jazzy, kilted, rolling]
1517
preset: [debug, release, asan, codecov]
1618
compiler:
1719
- { name: GCC }
@@ -21,8 +23,12 @@ jobs:
2123
compiler: { name: Clang }
2224
- preset: codecov
2325
ros_distro: humble
24-
runs-on: ubuntu-22.04
25-
container: ghcr.io/picknikrobotics/rsl:upstream-${{ matrix.ros_distro }}
26+
- preset: codecov
27+
ros_distro: jazzy
28+
- preset: codecov
29+
ros_distro: kilted
30+
runs-on: ubuntu-latest
31+
container: ghcr.io/ros-controls/ros:${{ matrix.ros_distro }}-ubuntu
2632
env:
2733
CCACHE_DIR: ${{ github.workspace }}/.ccache
2834
steps:
@@ -36,12 +42,21 @@ jobs:
3642
restore-keys: |
3743
ccache-cmake-${{ matrix.ros_distro }}-${{ matrix.preset }}-${{ github.sha }}
3844
ccache-cmake-${{ matrix.ros_distro }}-${{ matrix.preset }}
45+
- name: Install system dependencies
46+
run: |
47+
sudo apt update
48+
sudo apt install -y lld ccache
3949
- name: Source ROS
4050
run: |
4151
. /opt/ros/${{ matrix.ros_distro }}/setup.sh
4252
echo "$(env)" >> $GITHUB_ENV
53+
- name: Install ROS dependencies
54+
run: |
55+
sudo apt update
56+
rosdep update
57+
rosdep install --from-paths . --ignore-src -r -y
4358
- name: Install Clang
44-
if: matrix.compiler.name == 'clang'
59+
if: matrix.compiler.name == 'Clang'
4560
run: sudo apt update && sudo apt install clang
4661
- name: Configure
4762
run: cmake --preset ${{ matrix.preset }} ${{ matrix.compiler.flags }} -DCMAKE_INSTALL_PREFIX=install -DCMAKE_VERBOSE_MAKEFILE=ON
@@ -65,10 +80,11 @@ jobs:
6580

6681
ros:
6782
strategy:
83+
fail-fast: false
6884
matrix:
69-
ros_distro: [humble, rolling]
70-
runs-on: ubuntu-22.04
71-
container: ghcr.io/picknikrobotics/rsl:upstream-${{ matrix.ros_distro }}
85+
ros_distro: [humble, jazzy, kilted, rolling]
86+
runs-on: ubuntu-latest
87+
container: ghcr.io/ros-controls/ros:${{ matrix.ros_distro }}-ubuntu
7288
env:
7389
CCACHE_DIR: ${{ github.workspace }}/.ccache
7490
steps:
@@ -82,7 +98,11 @@ jobs:
8298
restore-keys: |
8399
ccache-ros-${{ matrix.ros_distro }}-${{ github.sha }}
84100
ccache-ros-${{ matrix.ros_distro }}
85-
- uses: ros-tooling/[email protected]
101+
- name: Install dependencies
102+
run: |
103+
sudo apt update
104+
sudo apt install -y lld ccache
105+
- uses: ros-tooling/[email protected]
86106
with:
87107
package-name: rsl
88108
target-ros2-distro: ${{ matrix.ros_distro }}

0 commit comments

Comments
 (0)