From a9aac89f554d40edad235beb35177ad00ca1167e Mon Sep 17 00:00:00 2001
From: Vatan Aksoy Tezer <vatan@picknik.ai>
Date: Tue, 8 Jun 2021 22:38:33 +0300
Subject: [PATCH] Add Galactic CI, cleanup rolling

---
 .github/workflows/build_and_test.yaml | 6 +++++-
 geometric_shapes_rolling.repos        | 9 ---------
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 geometric_shapes_rolling.repos

diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index c705022a..e5b696a9 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -24,8 +24,12 @@ jobs:
             ROS_REPO: main
           - ROS_DISTRO: rolling
             ROS_REPO: testing
+          - ROS_DISTRO: galactic
+            ROS_REPO: main
+          - ROS_DISTRO: galactic
+            ROS_REPO: testing
     env:
-      UPSTREAM_WORKSPACE: geometric_shapes${{ matrix.env.ROS_DISTRO == 'rolling' && '_rolling' || '' }}.repos
+      UPSTREAM_WORKSPACE: geometric_shapes.repos
       AFTER_SETUP_UPSTREAM_WORKSPACE: 'vcs pull $BASEDIR/upstream_ws/src'
       AFTER_RUN_TARGET_TEST: ${{ matrix.env.CCOV && './.ci.prepare_codecov' || '' }}
       TARGET_CMAKE_ARGS: >
diff --git a/geometric_shapes_rolling.repos b/geometric_shapes_rolling.repos
deleted file mode 100644
index e22a22c4..00000000
--- a/geometric_shapes_rolling.repos
+++ /dev/null
@@ -1,9 +0,0 @@
-repositories:
-  octomap:
-    type: git
-    url: https://github.com/octomap/octomap
-    version: devel
-  random_numbers:
-    type: git
-    url: https://github.com/ros-planning/random_numbers
-    version: ros2