Add Galactic CI, cleanup rolling

moveit · Jun 15, 2021 · 89dab66 · 89dab66
1 parent d3cb713
commit 89dab66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git 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