From 3820ed5963dca6b48586f510511aa48318bc8f6e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 9 Oct 2023 17:05:34 -0500 Subject: [PATCH 1/6] Bumps in ionic : ci_matching_branch/bump_ionic_gz-ionic Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 20 ++++++++++---------- CMakeLists.txt | 10 +++++----- gazebodistro/collection-ionic.yaml | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 5e021b8..4831c52 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,25 +1,25 @@ gz-launch7-cli -gz-plugin2-cli +gz-plugin3-cli gz-sim8-cli gz-transport13-cli -libgz-cmake3-dev -libgz-common5-dev +libgz-cmake4-dev +libgz-common6-dev libgz-fuel-tools9-dev libgz-gui8-dev libgz-launch7-dev -libgz-math7-dev -libgz-math7-eigen3-dev +libgz-math8-dev +libgz-math8-eigen3-dev libgz-msgs10-dev libgz-physics6-dev -libgz-plugin2-dev +libgz-plugin3-dev libgz-rendering8-dev libgz-sensors8-dev libgz-sim8-dev -libgz-tools2-dev +libgz-tools3-dev libgz-transport13-dev -libgz-utils2-cli-dev -libgz-utils2-dev +libgz-utils3-cli-dev +libgz-utils3-dev libsdformat13-dev -python3-gz-math7 +python3-gz-math8 python3-gz-sim8 python3-sdformat13 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1b596..689d2bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ project(gz-ionic VERSION 1.0.0) # Find gz-cmake #============================================================================ # If you get an error at this line, you need to install gz-cmake -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 REQUIRED) #============================================================================ # Configure the project @@ -18,19 +18,19 @@ gz_configure_project(VERSION_SUFFIX) # all list of ionic packages -gz_find_package(gz-common5 REQUIRED) +gz_find_package(gz-common6 REQUIRED) gz_find_package(gz-fuel_tools9 REQUIRED) gz_find_package(gz-sim8 REQUIRED) gz_find_package(gz-gui8 REQUIRED) gz_find_package(gz-launch7 REQUIRED) -gz_find_package(gz-math7 REQUIRED) +gz_find_package(gz-math8 REQUIRED) gz_find_package(gz-msgs10 REQUIRED) gz_find_package(gz-physics7 REQUIRED) -gz_find_package(gz-plugin2 REQUIRED) +gz_find_package(gz-plugin3 REQUIRED) gz_find_package(gz-rendering8 REQUIRED) gz_find_package(gz-sensors8 REQUIRED) gz_find_package(gz-transport13 REQUIRED) -gz_find_package(gz-utils2 REQUIRED) +gz_find_package(gz-utils3 REQUIRED) gz_find_package(sdformat14 REQUIRED) if(build_warnings) diff --git a/gazebodistro/collection-ionic.yaml b/gazebodistro/collection-ionic.yaml index e311bed..eadc641 100644 --- a/gazebodistro/collection-ionic.yaml +++ b/gazebodistro/collection-ionic.yaml @@ -3,11 +3,11 @@ repositories: gz-cmake: type: git url: https://github.com/gazebosim/gz-cmake - version: gz-cmake3 + version: main gz-common: type: git url: https://github.com/gazebosim/gz-common - version: gz-common5 + version: main gz-fuel-tools: type: git url: https://github.com/gazebosim/gz-fuel-tools @@ -27,7 +27,7 @@ repositories: gz-math: type: git url: https://github.com/gazebosim/gz-math - version: gz-math7 + version: main gz-msgs: type: git url: https://github.com/gazebosim/gz-msgs @@ -39,7 +39,7 @@ repositories: gz-plugin: type: git url: https://github.com/gazebosim/gz-plugin - version: gz-plugin2 + version: main gz-rendering: type: git url: https://github.com/gazebosim/gz-rendering @@ -51,7 +51,7 @@ repositories: gz-tools: type: git url: https://github.com/gazebosim/gz-tools - version: gz-tools2 + version: main gz-transport: type: git url: https://github.com/gazebosim/gz-transport @@ -59,7 +59,7 @@ repositories: gz-utils: type: git url: https://github.com/gazebosim/gz-utils - version: gz-utils2 + version: main sdformat: type: git url: https://github.com/gazebosim/sdformat From 05a8b6288d4fe114bd9984d0ce64457ec76925df Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:48:10 -0500 Subject: [PATCH 2/6] Bumps in ionic : ci_matching_branch/bump_ionic_gz-ionic Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 24 ++++++++++++------------ CMakeLists.txt | 20 ++++++++++---------- gazebodistro/collection-ionic.yaml | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 4831c52..a04fe4e 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,25 +1,25 @@ -gz-launch7-cli +gz-launch8-cli gz-plugin3-cli -gz-sim8-cli -gz-transport13-cli +gz-sim9-cli +gz-transport14-cli libgz-cmake4-dev libgz-common6-dev -libgz-fuel-tools9-dev -libgz-gui8-dev -libgz-launch7-dev +libgz-fuel-tools10-dev +libgz-gui9-dev +libgz-launch8-dev libgz-math8-dev libgz-math8-eigen3-dev -libgz-msgs10-dev +libgz-msgs11-dev libgz-physics6-dev libgz-plugin3-dev -libgz-rendering8-dev -libgz-sensors8-dev -libgz-sim8-dev +libgz-rendering9-dev +libgz-sensors9-dev +libgz-sim9-dev libgz-tools3-dev -libgz-transport13-dev +libgz-transport14-dev libgz-utils3-cli-dev libgz-utils3-dev libsdformat13-dev python3-gz-math8 -python3-gz-sim8 +python3-gz-sim9 python3-sdformat13 diff --git a/CMakeLists.txt b/CMakeLists.txt index 689d2bd..8f112db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,19 +19,19 @@ gz_configure_project(VERSION_SUFFIX) # all list of ionic packages gz_find_package(gz-common6 REQUIRED) -gz_find_package(gz-fuel_tools9 REQUIRED) -gz_find_package(gz-sim8 REQUIRED) -gz_find_package(gz-gui8 REQUIRED) -gz_find_package(gz-launch7 REQUIRED) +gz_find_package(gz-fuel_tools10 REQUIRED) +gz_find_package(gz-sim9 REQUIRED) +gz_find_package(gz-gui9 REQUIRED) +gz_find_package(gz-launch8 REQUIRED) gz_find_package(gz-math8 REQUIRED) -gz_find_package(gz-msgs10 REQUIRED) -gz_find_package(gz-physics7 REQUIRED) +gz_find_package(gz-msgs11 REQUIRED) +gz_find_package(gz-physics8 REQUIRED) gz_find_package(gz-plugin3 REQUIRED) -gz_find_package(gz-rendering8 REQUIRED) -gz_find_package(gz-sensors8 REQUIRED) -gz_find_package(gz-transport13 REQUIRED) +gz_find_package(gz-rendering9 REQUIRED) +gz_find_package(gz-sensors9 REQUIRED) +gz_find_package(gz-transport14 REQUIRED) gz_find_package(gz-utils3 REQUIRED) -gz_find_package(sdformat14 REQUIRED) +gz_find_package(sdformat15 REQUIRED) if(build_warnings) set(all_warnings " CONFIGURATION WARNINGS:") diff --git a/gazebodistro/collection-ionic.yaml b/gazebodistro/collection-ionic.yaml index eadc641..e6a893d 100644 --- a/gazebodistro/collection-ionic.yaml +++ b/gazebodistro/collection-ionic.yaml @@ -11,19 +11,19 @@ repositories: gz-fuel-tools: type: git url: https://github.com/gazebosim/gz-fuel-tools - version: gz-fuel-tools9 + version: main gz-sim: type: git url: https://github.com/gazebosim/gz-sim - version: gz-sim8 + version: main gz-gui: type: git url: https://github.com/gazebosim/gz-gui - version: gz-gui8 + version: main gz-launch: type: git url: https://github.com/gazebosim/gz-launch - version: gz-launch7 + version: main gz-math: type: git url: https://github.com/gazebosim/gz-math @@ -31,11 +31,11 @@ repositories: gz-msgs: type: git url: https://github.com/gazebosim/gz-msgs - version: gz-msgs10 + version: main gz-physics: type: git url: https://github.com/gazebosim/gz-physics - version: gz-physics7 + version: main gz-plugin: type: git url: https://github.com/gazebosim/gz-plugin @@ -43,11 +43,11 @@ repositories: gz-rendering: type: git url: https://github.com/gazebosim/gz-rendering - version: gz-rendering8 + version: main gz-sensors: type: git url: https://github.com/gazebosim/gz-sensors - version: gz-sensors8 + version: main gz-tools: type: git url: https://github.com/gazebosim/gz-tools @@ -55,7 +55,7 @@ repositories: gz-transport: type: git url: https://github.com/gazebosim/gz-transport - version: gz-transport13 + version: main gz-utils: type: git url: https://github.com/gazebosim/gz-utils From 29b5db2d5f9c2417df69754893b2fa3911bb209e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 25 Oct 2023 12:32:31 -0500 Subject: [PATCH 3/6] Install release_notes.md Signed-off-by: Addisu Z. Taddese --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f112db..df794b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,4 +54,4 @@ if(build_errors) endif() -install(DIRECTORY gazebodistro DESTINATION ${IGN_DATA_INSTALL_DIR}) +install(FILES release_notes.md DESTINATION ${GZ_DATA_INSTALL_DIR}) From 0c572a2c3c43bca1824dddbc99e80e3f53c16bc0 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 25 Oct 2023 13:23:14 -0500 Subject: [PATCH 4/6] Revert to gz-tools2 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index a04fe4e..7b26e0a 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -15,7 +15,7 @@ libgz-plugin3-dev libgz-rendering9-dev libgz-sensors9-dev libgz-sim9-dev -libgz-tools3-dev +libgz-tools2-dev libgz-transport14-dev libgz-utils3-cli-dev libgz-utils3-dev From e0680a625506e18af9876fbfddd4e5c0d7665670 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 27 Oct 2023 11:54:04 -0500 Subject: [PATCH 5/6] Address reviewer feedback --- .github/ci/packages.apt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 7b26e0a..e77c3c9 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -10,7 +10,7 @@ libgz-launch8-dev libgz-math8-dev libgz-math8-eigen3-dev libgz-msgs11-dev -libgz-physics6-dev +libgz-physics8-dev libgz-plugin3-dev libgz-rendering9-dev libgz-sensors9-dev @@ -19,7 +19,7 @@ libgz-tools2-dev libgz-transport14-dev libgz-utils3-cli-dev libgz-utils3-dev -libsdformat13-dev +libsdformat15-dev python3-gz-math8 python3-gz-sim9 -python3-sdformat13 +python3-sdformat15 From e396293c9d428926e610260171032204a599f027 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 27 Oct 2023 11:55:57 -0500 Subject: [PATCH 6/6] Remove collection-ionic.yaml since it's not needed anymore. --- gazebodistro/collection-ionic.yaml | 66 ------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 gazebodistro/collection-ionic.yaml diff --git a/gazebodistro/collection-ionic.yaml b/gazebodistro/collection-ionic.yaml deleted file mode 100644 index e6a893d..0000000 --- a/gazebodistro/collection-ionic.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -repositories: - gz-cmake: - type: git - url: https://github.com/gazebosim/gz-cmake - version: main - gz-common: - type: git - url: https://github.com/gazebosim/gz-common - version: main - gz-fuel-tools: - type: git - url: https://github.com/gazebosim/gz-fuel-tools - version: main - gz-sim: - type: git - url: https://github.com/gazebosim/gz-sim - version: main - gz-gui: - type: git - url: https://github.com/gazebosim/gz-gui - version: main - gz-launch: - type: git - url: https://github.com/gazebosim/gz-launch - version: main - gz-math: - type: git - url: https://github.com/gazebosim/gz-math - version: main - gz-msgs: - type: git - url: https://github.com/gazebosim/gz-msgs - version: main - gz-physics: - type: git - url: https://github.com/gazebosim/gz-physics - version: main - gz-plugin: - type: git - url: https://github.com/gazebosim/gz-plugin - version: main - gz-rendering: - type: git - url: https://github.com/gazebosim/gz-rendering - version: main - gz-sensors: - type: git - url: https://github.com/gazebosim/gz-sensors - version: main - gz-tools: - type: git - url: https://github.com/gazebosim/gz-tools - version: main - gz-transport: - type: git - url: https://github.com/gazebosim/gz-transport - version: main - gz-utils: - type: git - url: https://github.com/gazebosim/gz-utils - version: main - sdformat: - type: git - url: https://github.com/gazebosim/sdformat - version: sdf14