Update CI

tesseract-robotics · Jan 11, 2021 · 1c2da67 · 1c2da67
1 parent fb66489
commit 1c2da67
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 15 deletions.
diff --git a/.github/workflows/bionic_build.yml b/.github/workflows/bionic_build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - feature/CommandLanguage
   pull_request:
   schedule:
     - cron: '0 5 * * *'
@@ -19,8 +18,8 @@ jobs:
       OS_CODE_NAME: bionic
       ROS_DISTRO: melodic
       ROS_REPO: main
-      UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:ros-industrial-consortium/tesseract#feature/CommandLanguage github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu taskflow"
+      UPSTREAM_WORKSPACE: 'dependencies_with_ext.rosinstall'
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu taskflow"
       DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
       PARALLEL_TESTS: false
       CCACHE_DIR: "/home/runner/work/tesseract_ros/tesseract_ros/Bionic-Build/.ccache"

diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml
@@ -19,7 +19,7 @@ jobs:
       OS_CODE_NAME: bionic
       ROS_DISTRO: melodic
       ROS_REPO: main
-      ROSDEP_SKIP_KEYS: "bullet3 fcl taskflow"
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras fcl taskflow"
       CLANG_FORMAT_CHECK: file
       CLANG_FORMAT_VERSION: 8
       DOCKER_IMAGE: "rosindustrial/tesseract:melodic"

diff --git a/.github/workflows/clang_tidy.yml b/.github/workflows/clang_tidy.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - feature/CommandLanguage
   pull_request:
   schedule:
     - cron: '0 5 * * *'
@@ -17,11 +16,11 @@ jobs:
       CI_NAME: Clang-Tidy
       OS_NAME: ubuntu
       OS_CODE_NAME: bionic
-      ROS_DISTRO: melodic
+      ROS_DISTRO: noetic
       ROS_REPO: main
-      UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:ros-industrial-consortium/tesseract#feature/CommandLanguage github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu taskflow"
-      DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
+      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu taskflow"
+      DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
       CCACHE_DIR: "/home/runner/work/tesseract_ros/tesseract_ros/Clang-Tidy/.ccache"
       NOT_TEST_BUILD: true
       UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug"

diff --git a/.github/workflows/focal_build.yml b/.github/workflows/focal_build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - feature/CommandLanguage
   pull_request:
   schedule:
     - cron: '0 5 * * *'
@@ -19,8 +18,8 @@ jobs:
       OS_CODE_NAME: focal
       ROS_DISTRO: noetic
       ROS_REPO: main
-      UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:ros-industrial-consortium/tesseract#feature/CommandLanguage github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
-      ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts fcl iwyu taskflow"
+      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
+      ROSDEP_SKIP_KEYS: "bullet bullet-extras cmake_common_scripts fcl iwyu taskflow"
       DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
       PARALLEL_TESTS: false
       NOT_TEST_BUILD: true

diff --git a/dependencies.rosinstall b/dependencies.rosinstall
@@ -5,15 +5,19 @@
 - git:
     local-name: tesseract
     uri: https://github.com/ros-industrial-consortium/tesseract.git
-    version: feature/CommandLanguage
+    version: master
 - git:
     local-name: trajopt
     uri: https://github.com/ros-industrial-consortium/trajopt_ros.git
-    version: feature/CommandLanguage
+    version: master
+- git:
+    local-name: tesseract_planning
+    uri: https://github.com/ros-industrial-consortium/tesseract_planning.git
+    version: master
 - git:
     local-name: descartes_light
     uri: https://github.com/swri-robotics/descartes_light.git
-    version: feature/CommandLanguage
+    version: master
 - git:
     local-name: opw_kinematics
     uri: https://github.com/Jmeyer1292/opw_kinematics.git

diff --git a/dependencies_with_ext.rosinstall b/dependencies_with_ext.rosinstall
@@ -0,0 +1,32 @@
+- git:
+    local-name: cmake_common_scripts
+    uri: https://github.com/ros-industrial/cmake_common_scripts.git
+    version: master
+- git:
+    local-name: tesseract_ext
+    uri: https://github.com/ros-industrial-consortium/tesseract_ext.git
+    version: master
+- git:
+    local-name: tesseract
+    uri: https://github.com/ros-industrial-consortium/tesseract.git
+    version: master
+- git:
+    local-name: trajopt
+    uri: https://github.com/ros-industrial-consortium/trajopt_ros.git
+    version: master
+- git:
+    local-name: tesseract_planning
+    uri: https://github.com/ros-industrial-consortium/tesseract_planning.git
+    version: master
+- git:
+    local-name: descartes_light
+    uri: https://github.com/swri-robotics/descartes_light.git
+    version: master
+- git:
+    local-name: opw_kinematics
+    uri: https://github.com/Jmeyer1292/opw_kinematics.git
+    version: master
+- git:
+    local-name: ifopt
+    uri: https://github.com/ethz-adrl/ifopt.git
+    version: master