Skip to content
This repository was archived by the owner on Nov 13, 2017. It is now read-only.

Modifications for warehouse_ros refactor#699

Merged
v4hn merged 3 commits intomoveit:jade-develfrom
davetcoleman:cbrew_warehouse_ros_refactor
Jul 9, 2016
Merged

Modifications for warehouse_ros refactor#699
v4hn merged 3 commits intomoveit:jade-develfrom
davetcoleman:cbrew_warehouse_ros_refactor

Conversation

@davetcoleman
Copy link
Copy Markdown
Member

@davetcoleman davetcoleman commented Jun 28, 2016

Rebase #607 with latest jade-devel, along with small fix for a new file that was added since the original PR was created last August. Great work @TheBrewCrew

Required for #695

@mikeferguson

@davetcoleman davetcoleman changed the title Cbrew warehouse ros refactor Modifications for warehouse_ros refactor Jun 28, 2016
This was referenced Jun 28, 2016
Closed
Closed
Merged
This was referenced Jun 30, 2016
Closed
Merged
@130s
Copy link
Copy Markdown
Contributor

130s commented Jul 5, 2016

Travis job is failing because it tries to build moveit_ros (yes this repo itself) from source from jade-devel branch.

@davetcoleman
Copy link
Copy Markdown
Member Author

davetcoleman commented Jul 5, 2016

@130s so there is a bug in the .travis.yml script? should we switch to industrial_ci?

@rhaschke
Copy link
Copy Markdown
Contributor

rhaschke commented Jul 6, 2016

Simply looks like the file database_connection.h wasn't committed:

In file included from /home/travis/ros/ws_moveit/src/moveit_ros/warehouse/warehouse/src/moveit_message_storage.cpp:37:0:
/home/travis/ros/ws_moveit/src/moveit_ros/warehouse/warehouse/include/moveit/warehouse/moveit_message_storage.h:40:47: fatal error: warehouse_ros/database_connection.h: No such file or directory
 #include <warehouse_ros/database_connection.h>

The travis.yml is fine.

@davetcoleman
Copy link
Copy Markdown
Member Author

davetcoleman commented Jul 6, 2016

it builds fine locally and in my Docker containers though

@rhaschke
Copy link
Copy Markdown
Contributor

rhaschke commented Jul 6, 2016

Probably you have this include file locally, but missed to submit it.
When I checkout this PR, I don't see this file.

@davetcoleman
Copy link
Copy Markdown
Member Author

davetcoleman commented Jul 6, 2016

The file exists... https://github.com/ros-planning/warehouse_ros/blob/jade-devel/include/warehouse_ros/database_connection.h

I'll look into this further later, I've been focusing on an industrial_ci bug today in moveit_core

@davetcoleman davetcoleman mentioned this pull request Jul 8, 2016
Closed
9 tasks
@davetcoleman
Copy link
Copy Markdown
Member Author

davetcoleman commented Jul 8, 2016

This passes using new CI script. Ready to merge.

@rhaschke
Copy link
Copy Markdown
Contributor

rhaschke commented Jul 8, 2016

+1

@v4hn
Copy link
Copy Markdown
Contributor

v4hn commented Jul 9, 2016

Thanks for your work!

@v4hn v4hn merged commit 636fb5d into moveit:jade-devel Jul 9, 2016
@davetcoleman davetcoleman deleted the cbrew_warehouse_ros_refactor branch July 10, 2016 17:32
@davetcoleman davetcoleman mentioned this pull request Aug 6, 2016
Closed
@v4hn v4hn mentioned this pull request Aug 11, 2016
Closed
otamachan pushed a commit to otamachan/moveit_ros that referenced this pull request Oct 22, 2017
@davetcoleman @v4hn
Modifications for warehouse_ros refactor (moveit#699)
efab96c 
* Modifications for warehouse_ros refactor

* Missing RobotStateStorage conversion

* Switch travis to moveit_ci
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@davetcoleman @130s @rhaschke @v4hn @TheBrewCrew