From bf159c5117109b6596cc2a52a8446a190bef199e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 10 Jul 2020 14:05:13 +0200 Subject: [PATCH 1/5] Update deps for Dome: use msgs6 Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45ac49927..58789da25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 From 2ae18122303ad0feca5ef76249824531cd892321 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 10 Jul 2020 19:52:47 +0200 Subject: [PATCH 2/5] Add msgs6 to docker and configure.bat Signed-off-by: Jose Luis Rivero --- configure.bat | 2 +- docker/ign-transport/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.bat b/configure.bat index f4b3bb8b2..1293a393d 100644 --- a/configure.bat +++ b/configure.bat @@ -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 ign-msgs6 :: Set configuration variables @set build_type=Release diff --git a/docker/ign-transport/Dockerfile b/docker/ign-transport/Dockerfile index 95855a6e3..a70ced2fb 100644 --- a/docker/ign-transport/Dockerfile +++ b/docker/ign-transport/Dockerfile @@ -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 From 5cc950de50666203cf7b9c6427584b325d022cb7 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 10 Jul 2020 19:54:13 +0200 Subject: [PATCH 3/5] Update changelog Signed-off-by: Jose Luis Rivero --- Changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog.md b/Changelog.md index 74203a367..bb3187092 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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 From 5aa2c5e751460978c65f347503b968cf12b15122 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 16 Jul 2020 20:13:58 +0200 Subject: [PATCH 4/5] Test gzdev branch in ci-bionic Signed-off-by: Jose Luis Rivero --- .github/workflows/ci-bionic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml index f851b0a58..033621d48 100644 --- a/.github/workflows/ci-bionic.yml +++ b/.github/workflows/ci-bionic.yml @@ -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 }} From 872d8acd640d3a476ecf0e8487a33aa2267d3fc3 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 17 Jul 2020 15:03:57 +0200 Subject: [PATCH 5/5] use master to get msgs6 Signed-off-by: Jose Luis Rivero --- configure.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.bat b/configure.bat index 1293a393d..785ed617b 100644 --- a/configure.bat +++ b/configure.bat @@ -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-msgs6 +call %win_lib% :install_ign_project ign-msgs master :: Set configuration variables @set build_type=Release