Remove Citadel

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

Hide file tree

Showing 9 changed files with 4 additions and 45 deletions.
diff --git a/.github/workflows/ros2-ci.yml b/.github/workflows/ros2-ci.yml
@@ -9,9 +9,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - docker-image: "ubuntu:20.04"
-            ignition-version: "citadel"
-            ros-distro: "galactic"
           - docker-image: "ubuntu:20.04"
             ignition-version: "edifice"
             ros-distro: "galactic"

diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@ Noetic | Edifice | [noetic](https://github.com/osrf/ros_ign/tree/noetic) | only
 Noetic | Fortress | [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 | Edifice | [foxy](https://github.com/osrf/ros_ign/tree/foxy) | only from source
-Galactic | Citadel | [galactic](https://github.com/osrf/ros_ign/tree/galactic) | only from source
 Galactic | Edifice | [galactic](https://github.com/osrf/ros_ign/tree/galactic) | https://packages.ros.org
 Galactic | Fortress | [galactic](https://github.com/osrf/ros_ign/tree/galactic) | only from source
 Rolling | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | https://packages.ros.org
@@ -74,7 +73,7 @@ Be sure you've installed
 
 #### Ignition
 
-Install either [Citadel, Edifice or Fortress](https://ignitionrobotics.org/docs).
+Install either [Edifice or Fortress](https://ignitionrobotics.org/docs).
 
 Set the `IGNITION_VERSION` environment variable to the Ignition version you'd
 like to compile against. For example:

diff --git a/ros_ign_bridge/CMakeLists.txt b/ros_ign_bridge/CMakeLists.txt
@@ -21,17 +21,8 @@ find_package(std_msgs REQUIRED)
 find_package(tf2_msgs REQUIRED)
 find_package(trajectory_msgs REQUIRED)
 
-# Citadel
-if("$ENV{IGNITION_VERSION}" STREQUAL "citadel")
-  find_package(ignition-transport8 REQUIRED)
-  set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
-
-  find_package(ignition-msgs5 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
-
-  message(STATUS "Compiling against Ignition Citadel")
 # Fortress
-elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+if("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
   find_package(ignition-transport11 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 

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>
-  <!-- Citadel -->
-  <depend condition="$IGNITION_VERSION == citadel">ignition-msgs5</depend>
-  <depend condition="$IGNITION_VERSION == citadel">ignition-transport8</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>

diff --git a/ros_ign_gazebo/CMakeLists.txt b/ros_ign_gazebo/CMakeLists.txt
@@ -14,17 +14,8 @@ find_package(ament_cmake REQUIRED)
 find_package(ignition-math6 REQUIRED)
 find_package(rclcpp REQUIRED)
 
-# Citadel
-if("$ENV{IGNITION_VERSION}" STREQUAL "citadel")
-  find_package(ignition-transport8 REQUIRED)
-  set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
-
-  find_package(ignition-msgs5 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
-
-  message(STATUS "Compiling against Ignition Citadel")
 # Fortress
-elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+if("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
   find_package(ignition-transport11 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 

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>
-  <!-- Citadel -->
-  <depend condition="$IGNITION_VERSION == citadel">ignition-gazebo3</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_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>
-  <!-- Citadel -->
-  <exec_depend condition="$IGNITION_VERSION == citadel">ignition-gazebo3</exec_depend>
 
   <exec_depend>image_transport_plugins</exec_depend>
   <exec_depend>robot_state_publisher</exec_depend>

diff --git a/ros_ign_image/CMakeLists.txt b/ros_ign_image/CMakeLists.txt
@@ -16,17 +16,8 @@ find_package(ros_ign_bridge REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(sensor_msgs REQUIRED)
 
-# Citadel
-if("$ENV{IGNITION_VERSION}" STREQUAL "citadel")
-  find_package(ignition-transport8 REQUIRED)
-  set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
-
-  find_package(ignition-msgs5 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
-
-  message(STATUS "Compiling against Ignition Citadel")
 # Fortress
-elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+if("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
   find_package(ignition-transport11 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 

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>
-  <!-- Citadel -->
-  <depend condition="$IGNITION_VERSION == citadel">ignition-msgs5</depend>
-  <depend condition="$IGNITION_VERSION == citadel">ignition-transport8</depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>