Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,13 @@ jobs:
matrix:
ros_distribution:
- foxy
- galactic
- humble
- rolling
include:
# Foxy Fitzroy (June 2020 - May 2023)
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
ros_distribution: foxy
ros_version: 2
# Galactic Geochelone (May 2021 - November 2022)
- docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest
ros_distribution: galactic
ros_version: 2
# Humble Hawksbill (May 2022 - May 2027)
- docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
ros_distribution: humble
Expand All @@ -50,7 +45,7 @@ jobs:
echo ::set-output name=package_list::$(colcon list --names-only)

- name: Setup ROS environment
uses: ros-tooling/setup-ros@v0.3
uses: ros-tooling/setup-ros@v0.6
with:
required-ros-distributions: ${{ matrix.ros_distribution }}

Expand Down
4 changes: 2 additions & 2 deletions rclrs/src/dynamic_message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ use std::fmt::{self, Display};
use std::path::PathBuf;
use std::sync::Arc;

#[cfg(any(ros_distro = "foxy", ros_distro = "galactic"))]
#[cfg(ros_distro = "foxy")]
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMembers as rosidl_message_members_t;
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
use crate::rcl_bindings::rosidl_typesupport_introspection_c__MessageMembers_s as rosidl_message_members_t;
use crate::rcl_bindings::*;

Expand Down
10 changes: 5 additions & 5 deletions rclrs/src/subscription/message_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub struct MessageInfo {
/// received messages.
/// Those might have already been taken by other messages that were received in between or lost.
/// `psn2 - psn1 - 1 = 0` if and only if the messages were sent by the publisher consecutively.
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
pub publication_sequence_number: u64,
/// Sequence number of the received message set by the subscription.
///
Expand All @@ -98,7 +98,7 @@ pub struct MessageInfo {
///
/// - `rsn2 > rsn1` (except in the case of a wrap around)
/// - `rsn2 = rsn1 + 1` if and only if both messages were received consecutively.
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
pub reception_sequence_number: u64,
/// An identifier for the publisher that sent the message.
pub publisher_gid: PublisherGid,
Expand All @@ -123,9 +123,9 @@ impl MessageInfo {
Self {
source_timestamp,
received_timestamp,
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
publication_sequence_number: rmw_message_info.publication_sequence_number,
#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
reception_sequence_number: rmw_message_info.reception_sequence_number,
publisher_gid,
}
Expand All @@ -136,7 +136,7 @@ impl MessageInfo {
mod tests {
use super::*;

#[cfg(all(not(ros_distro = "foxy"), not(ros_distro = "galactic")))]
#[cfg(not(ros_distro = "foxy"))]
#[test]
fn negative_durations() {
let rmw_message_info = rmw_message_info_t {
Expand Down
25 changes: 0 additions & 25 deletions ros2_rust_galactic.repos

This file was deleted.