From c18de6b3cbf7b8c4f3aa8625424fd6658c020ca1 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 28 Dec 2021 11:02:26 -0800 Subject: [PATCH] =?UTF-8?q?[ros2]=20=F0=9F=8F=81=20Dome=20EOL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- .github/workflows/build-and-test.sh | 20 +------------------- README.md | 4 +--- ros_ign_bridge/CMakeLists.txt | 9 --------- ros_ign_bridge/package.xml | 3 --- ros_ign_gazebo/CMakeLists.txt | 9 --------- ros_ign_gazebo/package.xml | 2 -- ros_ign_gazebo_demos/package.xml | 2 -- ros_ign_image/CMakeLists.txt | 9 --------- ros_ign_image/package.xml | 3 --- 9 files changed, 2 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build-and-test.sh b/.github/workflows/build-and-test.sh index d722890a..92f849c4 100755 --- a/.github/workflows/build-and-test.sh +++ b/.github/workflows/build-and-test.sh @@ -10,25 +10,7 @@ export ROS_PYTHON_VERSION=3 apt update -qq apt install -qq -y lsb-release wget curl build-essential -# Citadel gets Ignition with rosdep -if [ "$IGNITION_VERSION" != "citadel" ]; then - echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list - echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-prerelease `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-prerelease.list - echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-nightly `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-nightly.list - wget https://packages.osrfoundation.org/gazebo.key -O - | apt-key add - - - if [ "$IGNITION_VERSION" == "dome" ]; then - IGN_DEPS="libignition-msgs6-dev libignition-transport9-dev libignition-gazebo4-dev" - fi - - if [ "$IGNITION_VERSION" == "edifice" ]; then - IGN_DEPS="libignition-msgs7-dev libignition-transport10-dev libignition-gazebo5-dev" - fi - - if [ "$IGNITION_VERSION" == "fortress" ]; then - IGN_DEPS="libignition-msgs8-dev libignition-transport11-dev libignition-gazebo6-dev" - fi -fi +# Citadel, Edifice and Fortress get Ignition with rosdep for Focal # Dependencies. echo "deb http://packages.ros.org/ros2/ubuntu `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list diff --git a/README.md b/README.md index de73a92a..9aa5f59e 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,11 @@ ROS version | Ignition version | Branch | Binaries hosted at -- | -- | -- | -- Melodic | Citadel | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | only from source -Melodic | Dome | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | https://packages.osrfoundation.org +Melodic | Fortress | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | only from source Noetic | Citadel | [noetic](https://github.com/osrf/ros_ign/tree/noetic) | https://packages.ros.org -Noetic | Dome | [noetic](https://github.com/osrf/ros_ign/tree/noetic) | only from source Noetic | Edifice | [noetic](https://github.com/osrf/ros_ign/tree/noetic) | only from source Noetic | Fortress (not released) | [noetic](https://github.com/osrf/ros_ign/tree/noetic) | only from source Foxy | Citadel | [foxy](https://github.com/osrf/ros_ign/tree/foxy) | https://packages.ros.org -Foxy | Dome | [foxy](https://github.com/osrf/ros_ign/tree/foxy) | only from source Foxy | Edifice | [foxy](https://github.com/osrf/ros_ign/tree/foxy) | only from source Galactic | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | https://packages.ros.org Rolling | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | https://packages.ros.org diff --git a/ros_ign_bridge/CMakeLists.txt b/ros_ign_bridge/CMakeLists.txt index a8d2752b..8fa89dd3 100644 --- a/ros_ign_bridge/CMakeLists.txt +++ b/ros_ign_bridge/CMakeLists.txt @@ -30,15 +30,6 @@ if("$ENV{IGNITION_VERSION}" STREQUAL "citadel") set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR}) message(STATUS "Compiling against Ignition Citadel") -# Dome -elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome") - find_package(ignition-transport9 REQUIRED) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) - - find_package(ignition-msgs6 REQUIRED) - set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) - - message(STATUS "Compiling against Ignition Dome") # Fortress elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress") find_package(ignition-transport11 REQUIRED) diff --git a/ros_ign_bridge/package.xml b/ros_ign_bridge/package.xml index bcab6df3..ee9a933a 100644 --- a/ros_ign_bridge/package.xml +++ b/ros_ign_bridge/package.xml @@ -31,9 +31,6 @@ ignition-transport10 ignition-msgs7 ignition-transport10 - - ignition-msgs6 - ignition-transport9 ignition-msgs5 ignition-transport8 diff --git a/ros_ign_gazebo/CMakeLists.txt b/ros_ign_gazebo/CMakeLists.txt index 8e2d4e7c..a7130638 100644 --- a/ros_ign_gazebo/CMakeLists.txt +++ b/ros_ign_gazebo/CMakeLists.txt @@ -23,15 +23,6 @@ if("$ENV{IGNITION_VERSION}" STREQUAL "citadel") set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR}) message(STATUS "Compiling against Ignition Citadel") -# Dome -elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome") - find_package(ignition-transport9 REQUIRED) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) - - find_package(ignition-msgs6 REQUIRED) - set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) - - message(STATUS "Compiling against Ignition Dome") # Fortress elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress") find_package(ignition-transport11 REQUIRED) diff --git a/ros_ign_gazebo/package.xml b/ros_ign_gazebo/package.xml index 0d221628..8daf16a7 100644 --- a/ros_ign_gazebo/package.xml +++ b/ros_ign_gazebo/package.xml @@ -22,8 +22,6 @@ ignition-gazebo5 ignition-gazebo5 - - ignition-gazebo4 ignition-gazebo3 diff --git a/ros_ign_gazebo_demos/package.xml b/ros_ign_gazebo_demos/package.xml index c87b294b..695b7e05 100644 --- a/ros_ign_gazebo_demos/package.xml +++ b/ros_ign_gazebo_demos/package.xml @@ -12,8 +12,6 @@ ignition-gazebo5 ignition-gazebo5 - - ignition-gazebo4 ignition-gazebo3 diff --git a/ros_ign_image/CMakeLists.txt b/ros_ign_image/CMakeLists.txt index 0901ad9f..e6715be0 100644 --- a/ros_ign_image/CMakeLists.txt +++ b/ros_ign_image/CMakeLists.txt @@ -25,15 +25,6 @@ if("$ENV{IGNITION_VERSION}" STREQUAL "citadel") set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR}) message(STATUS "Compiling against Ignition Citadel") -# Dome -elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome") - find_package(ignition-transport9 REQUIRED) - set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR}) - - find_package(ignition-msgs6 REQUIRED) - set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR}) - - message(STATUS "Compiling against Ignition Dome") # Fortress elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress") find_package(ignition-transport11 REQUIRED) diff --git a/ros_ign_image/package.xml b/ros_ign_image/package.xml index 4630b157..87974ca9 100644 --- a/ros_ign_image/package.xml +++ b/ros_ign_image/package.xml @@ -21,9 +21,6 @@ ignition-transport10 ignition-msgs7 ignition-transport10 - - ignition-msgs6 - ignition-transport9 ignition-msgs5 ignition-transport8