Separate galactic branch from ros2

Signed-off-by: Louise Poubel <[email protected]>

.github/workflows/ros2-ci.yml

@@ -10,14 +10,14 @@ jobs:
       matrix:
         include:
           - docker-image: "ubuntu:20.04"
-            ignition-version: "edifice"
+            ignition-version: "citadel"
             ros-distro: "galactic"
           - docker-image: "ubuntu:20.04"
             ignition-version: "edifice"
-            ros-distro: "rolling"
+            ros-distro: "galactic"
           - docker-image: "ubuntu:20.04"
             ignition-version: "fortress"
-            ros-distro: "rolling"
+            ros-distro: "galactic"
     container:
       image: ${{ matrix.docker-image }}
     steps:

README.md

@@ -6,12 +6,14 @@ Melodic | Citadel | [melodic](https://github.com/osrf/ros_ign/tree/melodic) | on
 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 | 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
+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 | Edifice | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | https://packages.ros.org
+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
-Rolling | Fortress (not released) | [ros2](https://github.com/osrf/ros_ign/tree/ros2) | only from source
+Rolling | Fortress | [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.
 
@@ -45,11 +47,11 @@ This repository holds packages that provide integration between
 
 ## Install
 
-This branch supports ROS Galactic and Rolling. See above for other ROS versions.
+This branch supports ROS Galactic. See above for other ROS versions.
 
 ### Binaries
 
-Galactic and Rolling binaries are available for Edifice.
+Galactic binaries are available for Edifice.
 They are hosted at https://packages.ros.org.
 
 1. Add https://packages.ros.org
@@ -60,21 +62,19 @@ They are hosted at https://packages.ros.org.
 
 1. Install `ros_ign`
 
-        sudo apt install ros-<distro>-ros-ign
-
-    Where `<distro>` can be `galactic` or `rolling`.
+        sudo apt install ros-galactic-ros-ign
 
 ### From source
 
 #### ROS
 
 Be sure you've installed
-[ROS Galactic or Rolling](https://index.ros.org/doc/ros2/Installation/)
+[ROS Galactic](https://index.ros.org/doc/ros2/Installation/)
 (at least ROS-Base). More ROS dependencies will be installed below.
 
 #### Ignition
 
-Install either [Edifice or Fortress](https://ignitionrobotics.org/docs).
+Install either [Citadel, 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:
@@ -102,18 +102,16 @@ The following steps are for Linux and OSX.
 
     ```
     cd ~/ws
-    rosdep install -r --from-paths src -i -y --rosdistro <distro>
+    rosdep install -r --from-paths src -i -y --rosdistro galactic
     ```
 
-    Where `<distro>` can be `galactic` or `rolling`.
-
     > 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:
 
     ```
     # Source ROS distro's setup.bash
-    source /opt/ros/<distro>/setup.bash
+    source /opt/ros/galactic/setup.bash
 
     # Build and install into workspace
     cd ~/ws