changing branch from moveit2-ci to master in prep for merge

AcutronicRobotics · Mar 25, 2019 · 27ab801 · 27ab801
1 parent ac66ce6
commit 27ab801
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile
@@ -70,7 +70,7 @@ RUN apt-get -qq update && \
 RUN mkdir src && \
     cd $ROS_WS/src && \
     # TODO(mlautman): This should be changed to use vcs in the future
-    wstool init --shallow . https://raw.githubusercontent.com/ros-planning/moveit2/moveit2-ci/moveit.rosinstall
+    wstool init --shallow . https://raw.githubusercontent.com/ros-planning/moveit2/master/moveit.rosinstall
 
 # Download all MoveIt dependencies
 RUN \

diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
@@ -10,7 +10,7 @@ RUN mkdir src && \
     cd src && \
     #
     # Download moveit source so that we can get necessary dependencies
-    wstool init . https://raw.githubusercontent.com/ros-planning/moveit2/moveit2-ci/moveit.rosinstall
+    wstool init . https://raw.githubusercontent.com/ros-planning/moveit2/master/moveit.rosinstall
 
 # Update apt package list as cache is cleared in previous container
 # Usually upgrading involves a few packages only (if container builds became out-of-sync)

diff --git a/moveit.rosinstall b/moveit.rosinstall
@@ -4,8 +4,7 @@
 - git:
     local-name: moveit2
     uri: https://github.com/ros-planning/moveit2.git
-    version: moveit2-ci
-
+    version: master
 - git:
     local-name: moveit_msgs
     # TODO(mlautman): update to ros-planning once the package has been merged back in