Skip to content

Commit 9e999e6

Browse files
authored
Merge pull request #547 from gazebosim/merge_14_main_20241007
Merge 14 -> main
2 parents 03994ee + 60b3f8b commit 9e999e6

19 files changed

+277
-407
lines changed

Changelog.md

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
11
## Gazebo Transport 14.X
22

3-
### Gazebo Transport 14.0.0 (2024-08-26)
3+
### Gazebo Transport 14.0.0 (2024-09-25)
4+
5+
1. **Baseline:** this includes all changes from 13.4.0 and earlier.
6+
7+
1. Miscellaneous documentation fixes
8+
* [Pull request #536](https://github.com/gazebosim/gz-transport/pull/536)
9+
* [Pull request #539](https://github.com/gazebosim/gz-transport/pull/539)
10+
* [Pull request #537](https://github.com/gazebosim/gz-transport/pull/537)
11+
* [Pull request #534](https://github.com/gazebosim/gz-transport/pull/534)
12+
* [Pull request #532](https://github.com/gazebosim/gz-transport/pull/533)
13+
* [Pull request #532](https://github.com/gazebosim/gz-transport/pull/532)
14+
* [Pull request #528](https://github.com/gazebosim/gz-transport/pull/528)
15+
* [Pull request #527](https://github.com/gazebosim/gz-transport/pull/527)
16+
* [Pull request #526](https://github.com/gazebosim/gz-transport/pull/526)
17+
18+
1. Simplify the relay tutorial docker setup
19+
* [Pull request #530](https://github.com/gazebosim/gz-transport/pull/530)
20+
21+
1. Replace deprecated File.exists with File.exist and tweak tutorial
22+
* [Pull request #529](https://github.com/gazebosim/gz-transport/pull/529)
23+
24+
1. Update gz-transport14 badge URLs
25+
* [Pull request #524](https://github.com/gazebosim/gz-transport/pull/524)
26+
27+
1. Ionic Changelog
28+
* [Pull request #523](https://github.com/gazebosim/gz-transport/pull/523)
429

530
1. Replace IGN_IP with GZ_IP
631
* [Pull request #515](https://github.com/gazebosim/gz-transport/pull/515)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Build | Status
1111
-- | --
1212
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-transport/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-transport/tree/main)
13-
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)
13+
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)
1414
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)
1515
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_transport-main-win)](https://build.osrfoundation.org/job/gz_transport-main-win/)
1616

docker/Dockerfile

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Ubuntu 24.04
2+
FROM ubuntu:noble
3+
4+
ENV TZ=America/Los_Angeles
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
7+
8+
# Tools I find useful during development
9+
RUN apt-get update \
10+
&& apt-get install -y \
11+
cmake \
12+
pkg-config \
13+
cppcheck \
14+
git \
15+
mercurial \
16+
build-essential \
17+
curl \
18+
libprotobuf-dev \
19+
protobuf-compiler \
20+
libprotoc-dev \
21+
libzmq3-dev \
22+
net-tools \
23+
uuid-dev \
24+
doxygen \
25+
ruby-ronn \
26+
libsqlite3-dev \
27+
python3-pybind11 \
28+
sudo \
29+
gnupg \
30+
lsb-release \
31+
wget \
32+
tzdata \
33+
&& apt-get clean
34+
35+
# Install gazebo dependencies
36+
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' \
37+
&& /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -' \
38+
&& apt-get update \
39+
&& apt-get install -y \
40+
libgz-cmake4-dev \
41+
libgz-math8-dev \
42+
libgz-msgs11-dev \
43+
libgz-utils3-cli-dev \
44+
&& apt-get clean
45+
46+
USER ubuntu
47+
WORKDIR /tmp
48+
# Gazebo transport
49+
RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport14
50+
RUN cd gz-transport \
51+
&& mkdir build \
52+
&& cd build \
53+
&& cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
54+
&& make -j4 install
55+
56+
# Gazebo transport examples
57+
RUN cd gz-transport/example \
58+
&& mkdir build \
59+
&& cd build \
60+
&& cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
61+
&& make -j4
62+
63+
WORKDIR /tmp/gz-transport/example/build
64+
65+
# Customize your image here.
66+
# E.g.:
67+
# ENV PATH="/opt/sublime_text:$PATH"

docker/build.bash

-44
This file was deleted.

docker/gz-transport/Dockerfile

-93
This file was deleted.

docker/run.bash

-91
This file was deleted.

example/playback.cc

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/// Launch the gz-transport subscriber example if the log was created
2222
/// by recording the publisher example.
2323

24+
//! [complete]
2425
#include <cstdint>
2526
#include <iostream>
2627
#include <regex>
@@ -62,4 +63,7 @@ int main(int argc, char *argv[])
6263
// Wait until the player stops on its own
6364
std::cout << "Playing all messages in the log file\n";
6465
handle->WaitUntilFinished();
66+
67+
return 0;
6568
}
69+
//! [complete]

example/record.cc

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
/// Launch the gz-transport publisher example so this example has
2121
/// something to record.
2222

23+
//! [complete]
2324
#include <cstdint>
2425
#include <iostream>
2526
#include <regex>
@@ -65,4 +66,7 @@ int main(int argc, char *argv[])
6566
recorder.Stop();
6667

6768
std::cout << "\nRecording finished!" << std::endl;
69+
70+
return 0;
6871
}
72+
//! [complete]

log/src/cmd/cmdlog.rb.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class Cmd
187187

188188
case options['subcommand']
189189
when 'record'
190-
if options['force'] and File.exists?(options['file'])
190+
if options['force'] and File.exist?(options['file'])
191191
begin
192192
File.delete(options['file'])
193193
rescue Exception => e

log/test/integration/playback.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ TEST(playback, GZ_UTILS_TEST_DISABLED_ON_MAC(ReplayPauseResume))
568568
//////////////////////////////////////////////////
569569
/// \brief Record a log and then play it back calling the Step method to control
570570
/// the playback workflow.
571-
TEST(playback, GZ_UTILS_TEST_DISABLED_ON_MAC(ReplayStep))
571+
TEST(playback, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ReplayStep))
572572
{
573573
std::vector<std::string> topics = {"/foo", "/bar", "/baz"};
574574

0 commit comments

Comments
 (0)