Skip to content

Commit

Permalink
Merge pull request #547 from gazebosim/merge_14_main_20241007
Browse files Browse the repository at this point in the history
Merge 14 -> main
  • Loading branch information
iche033 authored Oct 8, 2024
2 parents 03994ee + 60b3f8b commit 9e999e6
Show file tree
Hide file tree
Showing 19 changed files with 277 additions and 407 deletions.
27 changes: 26 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
## Gazebo Transport 14.X

### Gazebo Transport 14.0.0 (2024-08-26)
### Gazebo Transport 14.0.0 (2024-09-25)

1. **Baseline:** this includes all changes from 13.4.0 and earlier.

1. Miscellaneous documentation fixes
* [Pull request #536](https://github.com/gazebosim/gz-transport/pull/536)
* [Pull request #539](https://github.com/gazebosim/gz-transport/pull/539)
* [Pull request #537](https://github.com/gazebosim/gz-transport/pull/537)
* [Pull request #534](https://github.com/gazebosim/gz-transport/pull/534)
* [Pull request #532](https://github.com/gazebosim/gz-transport/pull/533)
* [Pull request #532](https://github.com/gazebosim/gz-transport/pull/532)
* [Pull request #528](https://github.com/gazebosim/gz-transport/pull/528)
* [Pull request #527](https://github.com/gazebosim/gz-transport/pull/527)
* [Pull request #526](https://github.com/gazebosim/gz-transport/pull/526)

1. Simplify the relay tutorial docker setup
* [Pull request #530](https://github.com/gazebosim/gz-transport/pull/530)

1. Replace deprecated File.exists with File.exist and tweak tutorial
* [Pull request #529](https://github.com/gazebosim/gz-transport/pull/529)

1. Update gz-transport14 badge URLs
* [Pull request #524](https://github.com/gazebosim/gz-transport/pull/524)

1. Ionic Changelog
* [Pull request #523](https://github.com/gazebosim/gz-transport/pull/523)

1. Replace IGN_IP with GZ_IP
* [Pull request #515](https://github.com/gazebosim/gz-transport/pull/515)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-transport/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-transport/tree/main)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_transport-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_transport-ci-main-jammy-amd64)
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_transport-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_transport-ci-main-noble-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_transport-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_transport-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_transport-main-win)](https://build.osrfoundation.org/job/gz_transport-main-win/)

Expand Down
67 changes: 67 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Ubuntu 24.04
FROM ubuntu:noble

ENV TZ=America/Los_Angeles
ENV DEBIAN_FRONTEND=noninteractive
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

# Tools I find useful during development
RUN apt-get update \
&& apt-get install -y \
cmake \
pkg-config \
cppcheck \
git \
mercurial \
build-essential \
curl \
libprotobuf-dev \
protobuf-compiler \
libprotoc-dev \
libzmq3-dev \
net-tools \
uuid-dev \
doxygen \
ruby-ronn \
libsqlite3-dev \
python3-pybind11 \
sudo \
gnupg \
lsb-release \
wget \
tzdata \
&& apt-get clean

# Install gazebo dependencies
RUN /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \
&& /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -' \
&& apt-get update \
&& apt-get install -y \
libgz-cmake4-dev \
libgz-math8-dev \
libgz-msgs11-dev \
libgz-utils3-cli-dev \
&& apt-get clean

USER ubuntu
WORKDIR /tmp
# Gazebo transport
RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport14
RUN cd gz-transport \
&& mkdir build \
&& cd build \
&& cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
&& make -j4 install

# Gazebo transport examples
RUN cd gz-transport/example \
&& mkdir build \
&& cd build \
&& cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
&& make -j4

WORKDIR /tmp/gz-transport/example/build

# Customize your image here.
# E.g.:
# ENV PATH="/opt/sublime_text:$PATH"
44 changes: 0 additions & 44 deletions docker/build.bash

This file was deleted.

93 changes: 0 additions & 93 deletions docker/gz-transport/Dockerfile

This file was deleted.

91 changes: 0 additions & 91 deletions docker/run.bash

This file was deleted.

4 changes: 4 additions & 0 deletions example/playback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
/// Launch the gz-transport subscriber example if the log was created
/// by recording the publisher example.

//! [complete]
#include <cstdint>
#include <iostream>
#include <regex>
Expand Down Expand Up @@ -62,4 +63,7 @@ int main(int argc, char *argv[])
// Wait until the player stops on its own
std::cout << "Playing all messages in the log file\n";
handle->WaitUntilFinished();

return 0;
}
//! [complete]
4 changes: 4 additions & 0 deletions example/record.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/// Launch the gz-transport publisher example so this example has
/// something to record.

//! [complete]
#include <cstdint>
#include <iostream>
#include <regex>
Expand Down Expand Up @@ -65,4 +66,7 @@ int main(int argc, char *argv[])
recorder.Stop();

std::cout << "\nRecording finished!" << std::endl;

return 0;
}
//! [complete]
2 changes: 1 addition & 1 deletion log/src/cmd/cmdlog.rb.in
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class Cmd

case options['subcommand']
when 'record'
if options['force'] and File.exists?(options['file'])
if options['force'] and File.exist?(options['file'])
begin
File.delete(options['file'])
rescue Exception => e
Expand Down
2 changes: 1 addition & 1 deletion log/test/integration/playback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ TEST(playback, GZ_UTILS_TEST_DISABLED_ON_MAC(ReplayPauseResume))
//////////////////////////////////////////////////
/// \brief Record a log and then play it back calling the Step method to control
/// the playback workflow.
TEST(playback, GZ_UTILS_TEST_DISABLED_ON_MAC(ReplayStep))
TEST(playback, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ReplayStep))
{
std::vector<std::string> topics = {"/foo", "/bar", "/baz"};

Expand Down
Loading

0 comments on commit 9e999e6

Please sign in to comment.