[noetic] Update version docs, add Fortress (#166)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

.github/workflows/build-and-test.sh

@@ -24,6 +24,10 @@ if [ "$IGNITION_VERSION" != "citadel" ]; then
   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
 
 # Dependencies.

.github/workflows/noetic-ci.yml

@@ -1,13 +1,6 @@
 name: Noetic CI
 
-on: 
-  pull_request:
-  push:
-    branches:
-      - noetic 
-    schedule:
-      # Run the CI automatically once per day to look for flakyness.
-      - cron: "0 0 * * *"
+on: [push, pull_request]
 
 jobs:
   ros_ign_ci:
@@ -25,6 +18,9 @@ jobs:
           - docker-image: "ubuntu:20.04"
             ignition-version: "edifice"
             ros-distro: "noetic"
+          - docker-image: "ubuntu:20.04"
+            ignition-version: "fortress"
+            ros-distro: "noetic"
     container:
       image: ${{ matrix.docker-image }}
     steps:

README.md

@@ -1,24 +1,19 @@
-[![Build Status](https://travis-ci.org/ignitionrobotics/ros_ign.svg?branch=noetic)](https://travis-ci.org/ignitionrobotics/ros_ign/branches)
+[![Build Status](https://github.com/ignitionrobotics/ros_ign/actions/workflows/noetic-ci.yml/badge.svg?branch=noetic)](https://github.com/ignitionrobotics/ros_ign/actions/workflows/noetic-ci.yml)
 
 ROS version | Ignition version | Branch | Binaries hosted at
 -- | -- | -- | --
-Melodic | Blueprint | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | https://packages.osrfoundation.org
 Melodic | Citadel | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | only from source
-Melodic | Dome | not supported |
-Noetic | Blueprint | not supported |
+Melodic | Dome | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | https://packages.osrfoundation.org
 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
-Dashing | Blueprint | [dashing](https://github.com/osrf/ros_ign/tree/dashing) | only from source
-Dashing | Citadel | [dashing](https://github.com/osrf/ros_ign/tree/dashing) | only from source
-Dashing | Dome | not supported |
-Eloquent | Blueprint | [dashing](https://github.com/osrf/ros_ign/tree/dashing) | only from source
-Eloquent | Citadel | [dashing](https://github.com/osrf/ros_ign/tree/dashing) | only from source
-Eloquent | Dome | not supported |
-Foxy | Blueprint | not supported |
-Foxy | Citadel | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | https://packages.ros.org
-Foxy | Dome | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | only from source
-Foxy | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | 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
+Rolling | Fortress (not released) | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | only from source
 
 > Please [ticket an issue](https://github.com/ignitionrobotics/ros_ign/issues/) if you'd like support to be added for some combination.
 
@@ -29,24 +24,24 @@ Foxy | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | only from s
 This repository holds packages that provide integration between
 [ROS](http://www.ros.org/) and [Ignition](https://ignitionrobotics.org):
 
-* [ros_ign](https://github.com/osrf/ros_ign/tree/noetic/ros_ign):
+* [ros_ign](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign):
   Metapackage which provides all the other packages.
-* [ros_ign_image](https://github.com/osrf/ros_ign/tree/noetic/ros_ign_image):
+* [ros_ign_image](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign_image):
   Unidirectional transport bridge for images from
   [Ignition Transport](https://ignitionrobotics.org/libs/transport)
   to ROS using
   [image_transport](http://wiki.ros.org/image_transport).
-* [ros_ign_bridge](https://github.com/osrf/ros_ign/tree/noetic/ros_ign_bridge):
+* [ros_ign_bridge](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign_bridge):
   Bidirectional transport bridge between
   [Ignition Transport](https://ignitionrobotics.org/libs/transport)
   and ROS.
-* [ros_ign_gazebo](https://github.com/osrf/ros_ign/tree/noetic/ros_ign_gazebo):
+* [ros_ign_gazebo](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign_gazebo):
   Convenient launch files and executables for using
   [Ignition Gazebo](https://ignitionrobotics.org/libs/gazebo)
   with ROS.
-* [ros_ign_gazebo_demos](https://github.com/osrf/ros_ign/tree/noetic/ros_ign_gazebo_demos):
+* [ros_ign_gazebo_demos](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign_gazebo_demos):
   Demos using the ROS-Ignition integration.
-* [ros_ign_point_cloud](https://github.com/osrf/ros_ign/tree/noetic/ros_ign_point_cloud):
+* [ros_ign_point_cloud](https://github.com/ignitionrobotics/ros_ign/tree/noetic/ros_ign_point_cloud):
   Plugins for publishing point clouds to ROS from
   [Ignition Gazebo](https://ignitionrobotics.org/libs/gazebo) simulations.
 
@@ -71,15 +66,15 @@ They are hosted at https://packages.ros.org.
 
 ### From source
 
-### ROS
+#### ROS
 
 Be sure you've installed
 [ROS Noetic](http://wiki.ros.org/noetic/Installation/Ubuntu) (at least ROS-Base).
 More ROS dependencies will be installed below.
 
-### Ignition
+#### Ignition
 
-Install either [Citadel, Dome or Edifice](https://ignitionrobotics.org/docs).
+Install either [Citadel, Dome, 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:
@@ -88,7 +83,7 @@ like to compile against. For example:
 
 > You only need to set this variable when compiling, not when running.
 
-### Compile ros_ign
+#### Compile ros_ign
 
 The following steps are for Linux and OSX.
 
@@ -107,9 +102,11 @@ The following steps are for Linux and OSX.
 
     ```
     cd ~/ws
-    rosdep install --from-paths src -i -y --rosdistro noetic
+    rosdep install -r --from-paths src -i -y --rosdistro noetic
     ```
 
+    > If `rosdep` fails to install Ignition libraries and you have not installed them before, please follow [Ignition installation instructions](https://ignitionrobotics.org/docs/latest/install).
+
 1. Build the workspace:
 
     ```

RELEASING.md

@@ -56,6 +56,7 @@ versions:
     * Citadel: 1
     * Dome: 2
     * Edifice: 3
+    * Fortress: 4
 
 ROS | Ignition | Version
 -- | -- | --

ros_ign_bridge/CMakeLists.txt

@@ -19,8 +19,17 @@ find_package(catkin REQUIRED COMPONENTS
                std_msgs
                tf2_msgs)
 
+# Fortress
+if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+  find_package(ignition-transport11 REQUIRED)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
+
+  find_package(ignition-msgs8 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
+
+  message(STATUS "Compiling against Ignition Fortress")
 # Edifice
-if ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
+elseif ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
   find_package(ignition-transport10 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 

ros_ign_bridge/package.xml

@@ -19,6 +19,9 @@
   <depend>std_srvs</depend>
   <depend>tf2_msgs</depend>
 
+  <!-- Fortress -->
+  <depend condition="$IGNITION_VERSION == fortress">ignition-msgs8</depend>
+  <depend condition="$IGNITION_VERSION == fortress">ignition-transport11</depend>
   <!-- Edifice -->
   <depend condition="$IGNITION_VERSION == edifice">ignition-msgs7</depend>
   <depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>

ros_ign_gazebo/CMakeLists.txt

@@ -8,8 +8,20 @@ find_package(catkin
     roscpp
 )
 
+# Fortress
+if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+  find_package(ignition-transport11 REQUIRED)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
+
+  find_package(ignition-msgs8 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
+
+  find_package(ignition-gazebo6 REQUIRED)
+  set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+
+  message(STATUS "Compiling against Ignition Fortress")
 # Edifice
-if ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
+elseif ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
   find_package(ignition-transport10 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 

ros_ign_gazebo/package.xml

@@ -10,6 +10,8 @@
   <depend>libgflags-dev</depend>
   <depend>roscpp</depend>
 
+  <!-- Fortress -->
+  <depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</depend>
   <!-- Edifice -->
   <depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</depend>
   <!-- Dome -->

ros_ign_gazebo_demos/package.xml

@@ -7,6 +7,8 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <!-- Fortress -->
+  <exec_depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</exec_depend>
   <!-- Edifice -->
   <exec_depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</exec_depend>
   <!-- Dome -->

ros_ign_image/CMakeLists.txt

@@ -16,8 +16,17 @@ find_package(catkin REQUIRED COMPONENTS
   roscpp
   sensor_msgs)
 
+# Fortress
+if ("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
+  find_package(ignition-transport11 REQUIRED)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
+
+  find_package(ignition-msgs8 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
+
+  message(STATUS "Compiling against Ignition Fortress")
 # Edifice
-if ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
+elseif ("$ENV{IGNITION_VERSION}" STREQUAL "edifice")
   find_package(ignition-transport10 REQUIRED)
   set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
 

ros_ign_image/package.xml

@@ -7,6 +7,9 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <!-- Fortress -->
+  <depend condition="$IGNITION_VERSION == fortress">ignition-msgs8</depend>
+  <depend condition="$IGNITION_VERSION == fortress">ignition-transport11</depend>
   <!-- Edifice -->
   <depend condition="$IGNITION_VERSION == edifice">ignition-msgs7</depend>
   <depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>

ros_ign_point_cloud/package.xml

@@ -10,6 +10,10 @@
   <depend>roscpp</depend>
   <depend>sensor_msgs</depend>
 
+  <!-- Fortress -->
+  <depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</depend>
+  <depend condition="$IGNITION_VERSION == fortress">ignition-rendering6</depend>
+  <depend condition="$IGNITION_VERSION == fortress">ignition-sensors6</depend>
   <!-- Edifice -->
   <depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</depend>
   <depend condition="$IGNITION_VERSION == edifice">ignition-rendering5</depend>