Maintainers Corner

This page is intended as a reference for maintainers

Maintaining Branches Across ROS Distros

Current mainline branch: indigo-devel

1. Pull requests should always target the mainline branch, unless the change is distribution specific.
2. Before the pull request is merged, or immediately after, git pull the resulting commit down into your local mainline branch

$ git pull origin indigo-devel

3. cherry pick the resulting commit along with its hash into each other ros-distro branch

$ git checkout kinetic-devel 
$ git cherry-pick -x abcdef
$ git checkout melodic-devel
$ git cherry-pick -x abcdef

where commit hash of the merged pull request is abcdef

4. Test the cherry picked commits in their respective branches by running a build in Docker locally (see the next section for details)

5. Once tested, push the updated branches back to the remote ROS branches

$ git checkout kinetic-devel 
$ git push origin kinetic-devel
$ git checkout melodic-devel
$ git push origin melodic-devel

Running SNS Docker container locally

This example uses melodic, but you can substitute it for any ROS distro accordingly.

$ cd ~/ros_ws/src/sns_ik
$ git checkout melodic-devel
$ docker run --name=sns-ik-melodic -it -v `pwd`:/root/ws_sns_ik/src/sns_ik rethinkroboticsopensource/sns-ik:melodic-ci-shadow-fixed /bin/bash

with the options meaning

--name=sns-ik-melodic is naming your current instance

-it will give you an interactive session

-v `pwd`:/root/ws_sns_ik/src/sns_ik will bind your current sns_ik git checkout directory into the container

rethinkroboticsopensource/sns-ik:melodic-ci-shadow-fixed is the docker hub melodic image for sns-ik shadow fixed

/bin/bash pops you into a bash shell when you enter the container

Releasing Via Bloom