Temporarily install moveit_resources in workspace

moveit · Dec 1, 2021 · df3fcb7 · df3fcb7
1 parent e492416
commit df3fcb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,6 +27,7 @@ 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)
+      TARGET_WORKSPACE: $TARGET_REPO_PATH github:henningkayser/moveit_resources#pr-port_prbt_packages
       # 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

diff --git a/moveit2.repos b/moveit2.repos
@@ -3,10 +3,13 @@ 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
+  # moveit_resources:
+  #   type: git
+  #   # TODO(henningkayser) Switch back when changes are upstream
+  #   # url: https://github.com/ros-planning/moveit_resources
+  #   # version: ros2
+  #   url: https://github.com/henningkayser/moveit_resources
+  #   version: pr-port_prbt_packages
   warehouse_ros:
     type: git
     url: https://github.com/ros-planning/warehouse_ros