Skip to content

Commit

Permalink
Merge branch 'main' into mjcarroll/test_cleanup_part3
Browse files Browse the repository at this point in the history
  • Loading branch information
azeey authored Jan 7, 2025
2 parents 1d21c20 + cb630af commit 58a0808
Show file tree
Hide file tree
Showing 31 changed files with 356 additions and 447 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-transport14 VERSION 14.0.0)
project(gz-transport15 VERSION 15.0.0)

#============================================================================
# Find gz-cmake
Expand Down Expand Up @@ -33,7 +33,7 @@ cmake_dependent_option(USE_DIST_PACKAGES_FOR_PYTHON
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(VERSION_SUFFIX)
gz_configure_project(VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
66 changes: 65 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,70 @@
## Gazebo Transport 15.X

### Gazebo Transport 15.0.0 (20XX-XX-XX)

## Gazebo Transport 14.X

### Gazebo Transport 14.0.0 (2023-XX-XX)
### 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)

1. Add an explicit dependency on cppzmq-dev
* [Pull request #512](https://github.com/gazebosim/gz-transport/pull/512)

1. Enable 24.04 CI, require cmake 3.22.1
* [Pull request #504](https://github.com/gazebosim/gz-transport/pull/504)

1. Allow programmatic configuration of unicast relays.
* [Pull request #498](https://github.com/gazebosim/gz-transport/pull/498)

1. Delete copy ctor and copy-assignment for log::Batch
* [Pull request #501](https://github.com/gazebosim/gz-transport/pull/501)

1. Remove python3-distutils since it's not needed on Jammy (#496)
* [Pull request #496) (#500](https://github.com/gazebosim/gz-transport/pull/496)

1. Find Python3 directly, not with GzPython
* [Pull request #472](https://github.com/gazebosim/gz-transport/pull/472)

1. gz_TEST: more output when tests fail
* [Pull request #479](https://github.com/gazebosim/gz-transport/pull/479)

1. Remove HIDE_SYMBOLS_BY_DEFAULT: replace by a default configuration in gz-cmake.
* [Pull request #467](https://github.com/gazebosim/gz-transport/pull/467)

1. Use HIDE_SYMBOLS_BY_DEFAULT
* [Pull request #461](https://github.com/gazebosim/gz-transport/pull/461)

1. Bumps in Ionic: gz-transport14
* [Pull request #455](https://github.com/gazebosim/gz-transport/pull/455)
* [Pull request #456](https://github.com/gazebosim/gz-transport/pull/456)


## Gazebo Transport 13.X

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.

Loading

0 comments on commit 58a0808

Please sign in to comment.