Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps for Dome: use msgs6 #149

Merged
merged 5 commits into from
Jul 21, 2020
Merged

Update deps for Dome: use msgs6 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf159c5
Update deps for Dome: use msgs6
j-rivero Jul 10, 2020
2ae1812
Add msgs6 to docker and configure.bat
j-rivero Jul 10, 2020
5cc950d
Update changelog
j-rivero Jul 10, 2020
5aa2c5e
Test gzdev branch in ci-bionic
j-rivero Jul 16, 2020
872d8ac
use master to get msgs6
j-rivero Jul 17, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-bionic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
id: ci
uses: ignition-tooling/ubuntu-bionic-ci-action@master
with:
apt-dependencies: 'pkg-config libprotobuf-dev protobuf-compiler libprotoc-dev libzmq3-dev uuid-dev libsqlite3-dev libignition-cmake2-dev libignition-math6-dev libignition-msgs5-dev libignition-tools-dev'
apt-dependencies: 'pkg-config libprotobuf-dev protobuf-compiler libprotoc-dev libzmq3-dev uuid-dev libsqlite3-dev libignition-cmake2-dev libignition-math6-dev libignition-msgs6-dev libignition-tools-dev'
codecov-token: ${{ secrets.CODECOV_TOKEN }}
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ endif()

#--------------------------------------
# Find ignition-msgs
ign_find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
ign_find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

#--------------------------------------
# Find ifaddrs
Expand Down
3 changes: 3 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

### Ignition Transport 9.X.X

1. Need ignition-msgs version 6
* [Github pull request 149](https://github.com/ignitionrobotics/ign-transport/pull/149/files)

### Ignition Transport 9.0.0

## Ignition Transport 8.X
Expand Down
2 changes: 1 addition & 1 deletion configure.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:: Install dependencies
call %win_lib% :download_unzip_install libzmq-4.2.3_cppzmq-4.2.2_vc15-x64-dll-MD.zip
call %win_lib% :download_unzip_install sqlite-3.22.0-vc15-Win64-dll-MD.zip
call %win_lib% :install_ign_project ign-msgs ign-msgs5
call %win_lib% :install_ign_project ign-msgs master

:: Set configuration variables
@set build_type=Release
Expand Down
2 changes: 1 addition & 1 deletion docker/ign-transport/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/g
&& sudo apt-get install -y \
libignition-cmake2-dev \
libignition-math6-dev \
libignition-msgs5-dev \
libignition-msgs6-dev \
&& sudo apt-get clean

# Ignition transport
Expand Down