Skip to content

Commit e5d0f81

Browse files
committed
Add support for ubuntu 22.04 and 24.04
1 parent 5f4d4a0 commit e5d0f81

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/cpp_ubuntu20_04.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,23 @@ on:
1010
jobs:
1111
build:
1212
runs-on: [ self-hosted, linux ]
13+
env:
14+
rosdistro: ${{ matrix.ubuntu == '20.04' && 'noetic' || 'one' }}
1315
strategy:
14-
fail-fast: false
16+
fail-fast: true
1517
matrix:
16-
rosdistro: [ 'noetic' ]
17-
gcc: [ '8', '9', '10', '11', '13' ]
18+
gcc: [ '8', '9', '10', '11', '12', '13' ]
1819
cxx: [ '11', '14', '17', '20' ]
20+
ubuntu: [ '20.04', '22.04', '24.04' ]
21+
exclude:
22+
- gcc: '8'
23+
ubuntu: '22.04'
24+
- gcc: '8'
25+
ubuntu: '24.04'
26+
- gcc: '12'
27+
ubuntu: '20.04'
1928
container:
20-
image: omavteam/ubuntu-omav-ros:ros-noetic-ros-base
29+
image: omavteam/ubuntu-omav-ros:ros-ros-base-${{ matrix.ubuntu }}
2130
credentials:
2231
username: ${{ secrets.DOCKER_USERNAME }}
2332
password: ${{ secrets.DOCKER_PASSWORD }}
@@ -37,11 +46,11 @@ jobs:
3746
g++ --version
3847
3948
- name: Build lpp
40-
run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && catkin build -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} -DLPP_BUILD_TESTS=1 lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
49+
run: source /opt/ros/${{ env.rosdistro }}/setup.bash && catkin build -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_CXX_STANDARD=${{ matrix.cxx }} -DLPP_BUILD_TESTS=1 lpp && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash
4150
working-directory: catkin_ws
4251
shell: bash
4352

4453
- name: Run unittests
45-
run: source /opt/ros/${{ matrix.rosdistro }}/setup.bash && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash && rosrun lpp test_lpp && rosrun lpp test_glog && rosrun lpp test_lpp_custom && rosrun lpp test_nolog && rosrun lpp test_default && rosrun lpp test_roslog
54+
run: source /opt/ros/${{ env.rosdistro }}/setup.bash && source ${GITHUB_WORKSPACE}/catkin_ws/devel/setup.bash && rosrun lpp test_lpp && rosrun lpp test_glog && rosrun lpp test_lpp_custom && rosrun lpp test_nolog && rosrun lpp test_default && rosrun lpp test_roslog
4655
working-directory: catkin_ws
4756
shell: bash

0 commit comments

Comments
 (0)