[ros2] 🏁 Dome EOL (#199)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Dec 29, 2021 · 4533f43 · 4533f43
1 parent dcd68ff
commit 4533f43
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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
@@ -31,9 +31,6 @@
   <depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>
   <depend condition="$IGNITION_VERSION == ''">ignition-msgs7</depend>
   <depend condition="$IGNITION_VERSION == ''">ignition-transport10</depend>
-  <!-- Dome -->
-  <depend condition="$IGNITION_VERSION == dome">ignition-msgs6</depend>
-  <depend condition="$IGNITION_VERSION == dome">ignition-transport9</depend>
   <!-- Citadel -->
   <depend condition="$IGNITION_VERSION == citadel">ignition-msgs5</depend>
   <depend condition="$IGNITION_VERSION == citadel">ignition-transport8</depend>

diff --git 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
@@ -22,8 +22,6 @@
   <!-- Edifice (default) -->
   <depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</depend>
   <depend condition="$IGNITION_VERSION == ''">ignition-gazebo5</depend>
-  <!-- Dome -->
-  <depend condition="$IGNITION_VERSION == dome">ignition-gazebo4</depend>
   <!-- Citadel -->
   <depend condition="$IGNITION_VERSION == citadel">ignition-gazebo3</depend>
 

diff --git a/ros_ign_gazebo_demos/package.xml b/ros_ign_gazebo_demos/package.xml
@@ -12,8 +12,6 @@
   <!-- Edifice (default) -->
   <exec_depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</exec_depend>
   <exec_depend condition="$IGNITION_VERSION == ''">ignition-gazebo5</exec_depend>
-  <!-- Dome -->
-  <exec_depend condition="$IGNITION_VERSION == dome">ignition-gazebo4</exec_depend>
   <!-- Citadel -->
   <exec_depend condition="$IGNITION_VERSION == citadel">ignition-gazebo3</exec_depend>
 

diff --git 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
@@ -21,9 +21,6 @@
   <depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>
   <depend condition="$IGNITION_VERSION == ''">ignition-msgs7</depend>
   <depend condition="$IGNITION_VERSION == ''">ignition-transport10</depend>
-  <!-- Dome -->
-  <depend condition="$IGNITION_VERSION == dome">ignition-msgs6</depend>
-  <depend condition="$IGNITION_VERSION == dome">ignition-transport9</depend>
   <!-- Citadel -->
   <depend condition="$IGNITION_VERSION == citadel">ignition-msgs5</depend>
   <depend condition="$IGNITION_VERSION == citadel">ignition-transport8</depend>