Skip to content

Commit cb13490

Browse files
authored
Merge pull request #20 from wep21/fix-rolling
chore: update headers for tf2, update CI
2 parents 638592f + 4ef25e7 commit cb13490

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/build_and_test.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,25 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
ros_distribution:
15-
- foxy
16-
- galactic
15+
- humble
16+
- jazzy
17+
- kilted
1718
- rolling
1819
include:
19-
# Foxy Fitzroy (June 2020 - May 2023)
20-
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
21-
ros_distribution: foxy
20+
# Humble Hawksbill (May 2022 - May 2027)
21+
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
22+
ros_distribution: humble
2223
ros_version: 2
23-
# Galactic Geochelone (May 2021 - November 2022)
24-
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest
25-
ros_distribution: galactic
24+
# Jazzy Jalisco (May 2024 - May 2029)
25+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
26+
ros_distribution: jazzy
27+
ros_version: 2
28+
# Kilted Kaiju (May 2025 - Dec 2026)
29+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-kilted-ros-base-latest
30+
ros_distribution: kilted
2631
ros_version: 2
2732
# Rolling Ridley (June 2020 - Present)
28-
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
33+
- docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
2934
ros_distribution: rolling
3035
ros_version: 2
3136
container:

include/octomap_ros/conversions.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939

4040
#include <octomap/octomap.h>
4141

42-
#include <tf2/LinearMath/Quaternion.h>
43-
#include <tf2/LinearMath/Transform.h>
44-
#include <tf2/LinearMath/Vector3.h>
42+
#include <tf2/LinearMath/Quaternion.hpp>
43+
#include <tf2/LinearMath/Transform.hpp>
44+
#include <tf2/LinearMath/Vector3.hpp>
4545

4646
#include <geometry_msgs/msg/point.hpp>
4747
#include <sensor_msgs/msg/point_cloud2.hpp>

0 commit comments

Comments
 (0)