Skip to content

Commit 3ae0944

Browse files
authored
Removed support for the EOL galactic distro (#306)
* Removed support for the EOL galactic distro * Bumped setup-ros to v0.6 * Try using the experimental debs * We don't actually need to use experimental debs anymore. --------- Co-authored-by: Sam Privett <[email protected]>
1 parent 37de108 commit 3ae0944

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

.github/workflows/rust.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,13 @@ jobs:
1717
matrix:
1818
ros_distribution:
1919
- foxy
20-
- galactic
2120
- humble
2221
- rolling
2322
include:
2423
# Foxy Fitzroy (June 2020 - May 2023)
2524
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
2625
ros_distribution: foxy
2726
ros_version: 2
28-
# Galactic Geochelone (May 2021 - November 2022)
29-
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest
30-
ros_distribution: galactic
31-
ros_version: 2
3227
# Humble Hawksbill (May 2022 - May 2027)
3328
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
3429
ros_distribution: humble
@@ -50,7 +45,7 @@ jobs:
5045
echo ::set-output name=package_list::$(colcon list --names-only)
5146
5247
- name: Setup ROS environment
53-
uses: ros-tooling/setup-ros@v0.3
48+
uses: ros-tooling/setup-ros@v0.6
5449
with:
5550
required-ros-distributions: ${{ matrix.ros_distribution }}
5651

rclrs/src/dynamic_message.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use std::fmt::{self, Display};
99
use std::path::PathBuf;
1010
use std::sync::Arc;
1111

12-
#[cfg(any(ros_distro = "foxy", ros_distro = "galactic"))]
12+
#[cfg(ros_distro = "foxy")]
1313
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMembers as rosidl_message_members_t;
14-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
14+
#[cfg(not(ros_distro = "foxy"))]
1515
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMembers_s as rosidl_message_members_t;
1616
use crate::rcl_bindings::*;
1717

rclrs/src/subscription/message_info.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub struct MessageInfo {
8080
/// received messages.
8181
/// Those might have already been taken by other messages that were received in between or lost.
8282
/// `psn2 - psn1 - 1 = 0` if and only if the messages were sent by the publisher consecutively.
83-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
83+
#[cfg(not(ros_distro = "foxy"))]
8484
pub publication_sequence_number: u64,
8585
/// Sequence number of the received message set by the subscription.
8686
///
@@ -98,7 +98,7 @@ pub struct MessageInfo {
9898
///
9999
/// - `rsn2 > rsn1` (except in the case of a wrap around)
100100
/// - `rsn2 = rsn1 + 1` if and only if both messages were received consecutively.
101-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
101+
#[cfg(not(ros_distro = "foxy"))]
102102
pub reception_sequence_number: u64,
103103
/// An identifier for the publisher that sent the message.
104104
pub publisher_gid: PublisherGid,
@@ -123,9 +123,9 @@ impl MessageInfo {
123123
Self {
124124
source_timestamp,
125125
received_timestamp,
126-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
126+
#[cfg(not(ros_distro = "foxy"))]
127127
publication_sequence_number: rmw_message_info.publication_sequence_number,
128-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
128+
#[cfg(not(ros_distro = "foxy"))]
129129
reception_sequence_number: rmw_message_info.reception_sequence_number,
130130
publisher_gid,
131131
}
@@ -136,7 +136,7 @@ impl MessageInfo {
136136
mod tests {
137137
use super::*;
138138

139-
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
139+
#[cfg(not(ros_distro = "foxy"))]
140140
#[test]
141141
fn negative_durations() {
142142
let rmw_message_info = rmw_message_info_t {

ros2_rust_galactic.repos

-25
This file was deleted.

0 commit comments

Comments
 (0)