Skip to content

Commit

Permalink
TEMP: configure required upstream and downstream dependencies, drop R…
Browse files Browse the repository at this point in the history
…oboStack workflows

- moveit/srdfdom#97
  extending the syntax of SRDF to specify these defaults (and exceptions)

- frankaemika/franka_ros#188
- moveit#2938
  allowing collision checking to be disabled by default for specific links

- RoboStack workflow doesn't use upstream config and thus fails
  • Loading branch information
rhaschke committed Dec 28, 2021
1 parent 2a66413 commit 8839758
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 107 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,15 @@ jobs:
DOCKER_IMAGE: moveit/moveit:${{ matrix.env.IMAGE }}
UPSTREAM_WORKSPACE: .github/workflows/upstream.rosinstall
TARGET_WORKSPACE: $TARGET_REPO_PATH github:ros-planning/moveit_resources#master
DOWNSTREAM_WORKSPACE: .github/workflows/downstream.rosinstall
DOWNSTREAM_WORKSPACE: >
.github/workflows/downstream.rosinstall
github:frankaemika/franka_ros#develop -franka_msgs -franka_hw -franka_control -franka_example_controllers -franka_gazebo -franka_ros -franka_visualization
# Pull any updates to the upstream workspace (after restoring it from cache)
AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src
AFTER_SETUP_DOWNSTREAM_WORKSPACE: vcs pull $BASEDIR/downstream_ws/src
AFTER_SETUP_DOWNSTREAM_WORKSPACE: |
vcs pull $BASEDIR/downstream_ws/src
mv $BASEDIR/downstream_ws/src/franka_ros/franka_description $BASEDIR/downstream_ws/src
rm -rf $BASEDIR/downstream_ws/src/franka_ros
# Clear the ccache stats before and log the stats after the build
AFTER_SETUP_CCACHE: ccache --zero-stats --max-size=10.0G
AFTER_BUILD_TARGET_WORKSPACE: ccache --show-stats
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/downstream.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
- git:
local-name: panda_moveit_config
uri: https://github.com/ros-planning/panda_moveit_config.git
version: melodic-devel
version: noetic-devel
104 changes: 0 additions & 104 deletions .github/workflows/robostack.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/upstream.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
local-name: geometric_shapes
uri: https://github.com/ros-planning/geometric_shapes.git
version: noetic-devel
- git:
local-name: srdfdom
uri: https://github.com/ubi-agni/srdfdom
version: rework-acm-defaults

0 comments on commit 8839758

Please sign in to comment.