Skip to content

Commit deff6c5

Browse files
Levi ArmstrongLevi-Armstrong
authored andcommitted
Remove taskflow from target_workspace in CI, now included in docker
1 parent 00abd4e commit deff6c5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/bionic_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
ROS_DISTRO: melodic
2121
ROS_REPO: main
2222
UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
23-
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:mpowelson/cpp-taskflow#catkinized'
24-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl"
23+
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage'
24+
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl taskflow"
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Bionic-Build/.ccache"
2727
PARALLEL_TESTS: false

.github/workflows/clang_tidy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
ROS_DISTRO: melodic
2121
ROS_REPO: main
2222
UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
23-
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:mpowelson/cpp-taskflow#catkinized'
24-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl"
23+
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage'
24+
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl taskflow"
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Clang-Tidy/.ccache"
2727
NOT_TEST_BUILD: true

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
ROS_DISTRO: melodic
2121
ROS_REPO: main
2222
UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
23-
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:mpowelson/cpp-taskflow#catkinized'
24-
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl"
23+
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage'
24+
ROSDEP_SKIP_KEYS: "bullet3 cmake_common_scripts iwyu fcl taskflow"
2525
DOCKER_IMAGE: "rosindustrial/tesseract:melodic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/CodeCov/.ccache"
2727
UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"

.github/workflows/focal_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
ROS_DISTRO: noetic
2121
ROS_REPO: main
2222
UPSTREAM_WORKSPACE: 'github:swri-robotics/descartes_light#feature/CommandLanguage github:Jmeyer1292/opw_kinematics#master github:ethz-adrl/ifopt#master github:ros-industrial/cmake_common_scripts#master'
23-
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage github:mpowelson/cpp-taskflow#catkinized'
24-
ROSDEP_SKIP_KEYS: "bullet3 fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics cmake_common_scripts iwyu"
23+
TARGET_WORKSPACE: '. github:ros-industrial-consortium/trajopt_ros#feature/CommandLanguage'
24+
ROSDEP_SKIP_KEYS: "bullet3 fcl ompl orocos_kdl python-numpy ifopt python descartes_opw descartes_samplers descartes_light opw_kinematics cmake_common_scripts iwyu taskflow"
2525
DOCKER_IMAGE: "rosindustrial/tesseract:noetic"
2626
CCACHE_DIR: "/home/runner/work/tesseract/tesseract/Focal-Build/.ccache"
2727
PARALLEL_TESTS: false

0 commit comments

Comments
 (0)