Remove all but Focal CI build on GH Actions

Bionic and Xenial were failing for some reason, but the Travis CI build will test those for now
swri-robotics · Jun 19, 2020 · b113e4a · b113e4a
1 parent 757dc67
commit b113e4a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 43 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,55 +21,20 @@ jobs:
              ROS_REPO: main,
              ROSDEP_SKIP_KEYS: "bullet3 fcl",
              CLANG_FORMAT_CHECK: file,
-             CLANG_FORMAT_VERSION: 8,
-             DOCKER_IMAGE: "lharmstrong/tesseract:melodic"}
-          - {CI_NAME: Clang-Tidy,
-             OS_NAME: ubuntu,
-             OS_CODE_NAME: bionic,
-             ROS_DISTRO: melodic,
-             ROS_REPO: main,
-             UPSTREAM_WORKSPACE: dependencies.rosinstall,
-             ROSDEP_SKIP_KEYS: "bullet3 fcl",
-             CCACHE_DIR: "/home/runner/work/pcs/pcs/Clang-Tidy/.ccache",
-             NOT_TEST_BUILD: true,
-             UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
-             TARGET_CMAKE_ARGS: "-DTESSERACT_ENABLE_CLANG_TIDY=ON -DENABLE_TESTS=ON"}
+             CLANG_FORMAT_VERSION: 8}
           - {CI_NAME: Focal-Build,
              OS_NAME: ubuntu,
              OS_CODE_NAME: focal,
              ROS_DISTRO: noetic,
              ROS_REPO: main,
-             UPSTREAM_WORKSPACE: dependencies.rosinstall,
-             ROSDEP_SKIP_KEYS: "bullet3 fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics",
-             CCACHE_DIR: "/home/runner/work/pcs/pcs/Bionic-Build/.ccache",
+             UPSTREAM_WORKSPACE: 'dependencies.rosinstall',
+             ADDITIONAL_DEBS: 'libompl-dev',
+             ROSDEP_SKIP_KEYS: "bullet3 fcl ompl orocos_kdl python-numpy python-opencv ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics",
+             CCACHE_DIR: "/home/runner/work/pcs/pcs/Focal-Build/.ccache",
              PARALLEL_TESTS: false,
              BEFORE_RUN_TARGET_TEST_EMBED: "source /root/target_ws/install/setup.bash",
              UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
              TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON"}
-          - {CI_NAME: Bionic-Build,
-             OS_NAME: ubuntu,
-             OS_CODE_NAME: bionic,
-             ROS_DISTRO: melodic,
-             ROS_REPO: main,
-             UPSTREAM_WORKSPACE: dependencies.rosinstall,
-             ROSDEP_SKIP_KEYS: "bullet3 fcl",
-             CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Bionic-Build/.ccache",
-             PARALLEL_TESTS: false,
-             UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
-             TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON",
-             AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose pcs_detection pcs_ros pcs_scan_integration --make-args test'}
-          - {CI_NAME: Xenial-Build,
-             OS_NAME: ubuntu,
-             OS_CODE_NAME: xenial,
-             ROS_DISTRO: kinetic,
-             ROS_REPO: main,
-             UPSTREAM_WORKSPACE: dependencies.rosinstall,
-             ROSDEP_SKIP_KEYS: "bullet3 fcl benchmark",
-             CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Xenial-Build/.ccache",
-             PARALLEL_TESTS: false,
-             UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release",
-             TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON",
-             AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose pcs_detection pcs_ros pcs_scan_integration --make-args test'}
 
     steps:
       - uses: actions/checkout@v1

diff --git a/dependencies.rosinstall b/dependencies.rosinstall
@@ -1,7 +1,7 @@
 # Descartes Light
 - git: {local-name: descartes_light, uri: 'https://github.com/swri-robotics/descartes_light.git', version: master}
 
-# IFOPT: Used by TrajOpt
+# IFOPT- Used by TrajOpt
 - git: {local-name: ifopt, uri: https://github.com/ethz-adrl/ifopt.git, version: master}
 
 # OPW Kinematics

diff --git a/pcs_detection/package.xml b/pcs_detection/package.xml
@@ -8,8 +8,8 @@
 
   <license>Apache 2.0</license>
 
-  <exec_depend>python-numpy</exec_depend>
-  <exec_depend>python-opencv</exec_depend>
+  <exec_depend>python3-numpy</exec_depend>
+  <exec_depend>python3-opencv</exec_depend>
   <depend>libconsole-bridge-dev</depend>
 
   <test_depend>tesseract_common</test_depend>