Skip to content

Commit

Permalink
Temporarily install moveit_resources in workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
henningkayser committed Dec 3, 2021
1 parent ebf83c3 commit bf951ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
CXXFLAGS: "-Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-deprecated-copy"
DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }}
UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
# TODO(#885): Fix circular test dependency with moveit_resources and remove it from the target workspace
TARGET_WORKSPACE: $TARGET_REPO_PATH github:ros-planning/moveit_resources#ros2
# 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
Expand Down
9 changes: 5 additions & 4 deletions moveit2.repos
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ repositories:
type: git
url: https://github.com/ros-planning/geometric_shapes
version: ros2
moveit_resources:
type: git
url: https://github.com/ros-planning/moveit_resources
version: ros2
# TODO(#885): Re-enable when circular dependency is fixed
# moveit_resources:
# type: git
# url: https://github.com/ros-planning/moveit_resources
# version: ros2
warehouse_ros:
type: git
url: https://github.com/ros-planning/warehouse_ros
Expand Down

0 comments on commit bf951ea

Please sign in to comment.