mikeferguson / buildbot-ros

A buildbot configuration for building ROS debians, docs, and tests.
51 stars 27 forks source link

git-buildpackage broken on 14.04 #42

Closed mkoval closed 10 years ago

mkoval commented 10 years ago

I've been successfully running buildbot-ros in a Ubuntu 12.04 VM for quite a while now. I recently tried upgrading to Ubuntu 14.04 and git-buildpackage fails with the following error:

$ git checkout debian/ros-indigo-cbirrt2_1.0.0-0_trusty
$ git-buildpackage -us -uc --git-ignore-branch --git-ignore-new --git-verbose
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: /bin/true [] []
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'show-ref', 'refs/heads/release/indigo/manipulation2/1.0.0-0']
gbp:error: release/indigo/manipulation2/1.0.0-0 is not a valid branch

It looks like git-buildpackage is trying to verify the branch name even though buildbot-ros passes the --git-ignore-branch flag to disable it. I also tried setting --git-debian-tag to the correct value to no avail.

@mikeferguson Have you also run into this?

mikeferguson commented 10 years ago

On 14.04 you need "--git-upstream-tree=TAG", are you up to date, this should have been fixed in https://github.com/mikeferguson/buildbot-ros/pull/38

mkoval commented 10 years ago

Perfect, thanks!

mikeferguson commented 10 years ago

If you are by chance still using 12.04 at the same time, be aware we didn't actually test on 12.04 -- let me know if you have any issues.