search

ethz-asl / cad-percept

Bringing meshes to robotics.
BSD 3-Clause "New" or "Revised" License
5 stars 1 forks source link

Go icp feature #73

Closed drehermarc closed 4 years ago

drehermarc commented 4 years ago

All files including Go-ICP

hermannsblum commented 4 years ago

@dreherm-student-ethz We are getting merged more and more :) Can you please resolve the conflicts of this branch and the master, and update to the external ethzasl/go_icp_catkin wrapper?

Then we can give this PR another review and make it ready for merge!

ethzasl-jenkins commented 4 years ago

Test FAILed.

ethzasl-jenkins commented 4 years ago

Test FAILed.

drehermarc commented 4 years ago

Test FAILed.

ERROR in config: Error processing 'go_icp_catkin' : [go_icp_catkin] Checkout of https://github.com/ethz-asl/go_icp_catkin version None into /home/jenkins/workspace/projection-node-PR/label/mapcompute-bionic/src/dependencies/go_icp_catkin failed.

Hi :) Could it be that we need to make the repository "go_icp_catkin" public, such that Jenkins can access it? It works on all my devices, however I need to enter my password.

hermannsblum commented 4 years ago

Could it be that we need to make the repository "go_icp_catkin" public, such that Jenkins can access it? It works on all my devices, however I need to enter my password.

You're diagnosis is right, but it's simpler than that: just use the ssl instead of http for the repository url here https://github.com/ethz-asl/cad-percept/blob/719ec64e5b8097494761eec2e9f1a188a5c3d049/dependencies.rosinstall#L53 Jenkins has access to all private asl repositories, but only when he authenticates with ssl.

hermannsblum commented 4 years ago

Sorry to bother you again, but something went wrong when you merged with the master branch. Many commits that are already part of the master are still part of this PR (which should not be after merging with master).

The commit network also looks a bit weird around your master merge (which is hard to see behind the master label) image

drehermarc commented 4 years ago

Sorry to bother you again, but something went wrong when you merged with the master branch. Many commits that are already part of the master are still part of this PR (which should not be after merging with master). The commit network also looks a bit weird around your master merge (which is hard to see behind the master label)

Hey, Yes sorry, you're right, I pulled the changes from master and commited the manually picked files. Shall I create a new branch with PR considering the changes of this PR?

hermannsblum commented 4 years ago

maybe that‘s the easiest. Probably there is also some git magic that can correct this, but I wouldn‘t know how exactly, so whatever makes it work is fine :)

hermannsblum commented 4 years ago

closing as duplicate of new clean PR #76