Skip to content

Commit 44a475a

Browse files
authored
Support humble CI (#48)
* Change CI from foxy to humble * Fix submodules * Fix CI * Update lidarslam_msgs/CMakeLists.txt * Update main.yml * Delete sudo in main,yml * Fix main.yml * Add locales install in main.yml
1 parent 479f768 commit 44a475a

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
name: foxy
1+
name: humble
22

33
on:
44
push:
55
branches:
6-
- foxy
6+
- humble
77
pull_request:
88
branches:
9-
- foxy
9+
- humble
1010

1111
jobs:
1212
job1:
1313
name: Build
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
15+
# container:
16+
# image: ubuntu:jammy
1517
steps:
1618
- name: ROS2 Install
1719
run: |
18-
# Ref: https://index.ros.org/doc/ros2/Installation/Foxy/Linux-Install-Debians/
20+
sudo apt update && sudo apt install locales
1921
sudo locale-gen en_US en_US.UTF-8
2022
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
2123
export LANG=en_US.UTF-8
2224
sudo apt update && sudo apt install curl gnupg2 lsb-release
2325
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
2426
sudo sh -c 'echo "deb [arch=amd64,arm64] http://packages.ros.org/ros2/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
2527
sudo apt update
26-
sudo apt install ros-foxy-desktop
27-
source /opt/ros/foxy/setup.bash
28+
sudo apt install ros-humble-desktop
29+
source /opt/ros/humble/setup.bash
2830
- uses: actions/checkout@v1
2931
with:
3032
submodules: true
@@ -34,17 +36,17 @@ jobs:
3436
cp -rf . ~/ros2_ws/src/lidarslam_ros2
3537
- name: Install dependencies
3638
run: |
37-
source /opt/ros/foxy/setup.bash
39+
source /opt/ros/humble/setup.bash
3840
sudo apt install -y python3-rosdep2
3941
rosdep update
4042
cd ~/ros2_ws/src
4143
rosdep install -r -y --from-paths . --ignore-src
4244
- name: Build packages
4345
run: |
44-
source /opt/ros/foxy/setup.bash
46+
source /opt/ros/humble/setup.bash
4547
# Install colcon
4648
# Ref: https://index.ros.org/doc/ros2/Tutorials/Colcon-Tutorial/
4749
sudo apt install python3-colcon-common-extensions
4850
cd ~/ros2_ws
4951
colcon build
50-
source ~/ros2_ws/install/setup.bash
52+
source ~/ros2_ws/install/setup.bash

lidarslam_msgs/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1616
endif()
1717

1818
# find dependencies
19-
find_package(ament_cmake REQUIRED)
20-
find_package(std_msgs REQUIRED)
21-
find_package(geometry_msgs REQUIRED)
22-
find_package(sensor_msgs REQUIRED)
23-
find_package(builtin_interfaces REQUIRED)
24-
find_package(rosidl_default_generators REQUIRED)
19+
find_package(ament_cmake_auto REQUIRED)
20+
ament_auto_find_build_dependencies()
2521

2622
rosidl_generate_interfaces(${PROJECT_NAME}
2723
"msg/SubMap.msg"
@@ -34,6 +30,4 @@ if(BUILD_TESTING)
3430
ament_lint_auto_find_test_dependencies()
3531
endif()
3632

37-
ament_export_dependencies(rosidl_default_runtime)
38-
ament_export_include_directories(include)
39-
ament_package()
33+
ament_auto_package()

0 commit comments

Comments
 (0)