Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link and compile against rosbag2_storage_mcap: Fixed issue 1492 #1496

Merged
merged 2 commits into from Nov 17, 2023
Merged

Link and compile against rosbag2_storage_mcap: Fixed issue 1492 #1496

merged 2 commits into from Nov 17, 2023

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Nov 14, 2023

Fixed issue #1492

How to test it

rm -rf /tmp/colcon-example && mkdir /tmp/colcon-example && cd /tmp/colcon-example
mkdir -p src/example

cat > src/example/CMakeLists.txt <<'EOF'
cmake_minimum_required(VERSION 3.14)
project(example)

find_package(ament_cmake REQUIRED)
find_package(rosbag2_storage_mcap REQUIRED)

file(WRITE empty.cc "")
add_library(${PROJECT_NAME} SHARED empty.cc)

target_link_libraries(${PROJECT_NAME} rosbag2_storage_mcap::rosbag2_storage_mcap)

ament_package()
EOF

cat > src/example/package.xml <<'EOF'
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
  <name>example</name>
  <version>0.0.1</version>
  <description>thing</description>
  <maintainer email="meh@nowhere.com">Meh</maintainer>
  <license>Apache-2.0</license>
  <buildtool_depend>ament_cmake</buildtool_depend>
  <depend>rosbag2_storage_map</depend>
  <export>
    <build_type>ament_cmake</build_type>
  </export>
</package>
EOF

source /opt/ros/humble/setup.bash
colcon build

FYI @EricCousineau-TRI

@ahcorde ahcorde requested a review from a team as a code owner November 14, 2023 16:39
@ahcorde ahcorde self-assigned this Nov 14, 2023
@ahcorde ahcorde requested review from gbiggs and jhdcs and removed request for a team November 14, 2023 16:39
@ahcorde ahcorde mentioned this pull request Nov 14, 2023
Closed
@MichaelOrlov
Copy link
Contributor

@ahcorde Could you please retarget your PR to the Rolling branch?
Our workflow for the fixes is the first fix on Rolling then backport to the other releases.

@ahcorde ahcorde changed the base branch from humble to rolling November 14, 2023 17:33
@ahcorde
Link and compile against rosbag2_storage_mcap: Fixed issue 1492
5944744 
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor Author

ahcorde commented Nov 14, 2023

Sure @MichaelOrlov, Done

@ahcorde
Copy link
Contributor Author

ahcorde commented Nov 15, 2023

@MichaelOrlov some tests are failing is this expected?

@MichaelOrlov
Copy link
Contributor

@MichaelOrlov some tests are failing is this expected?

Actually not. Those types of test failures are not expected.

@MichaelOrlov
Copy link
Contributor

@ros-pull-request-builder retest this please

@ahcorde
Copy link
Contributor Author

ahcorde commented Nov 16, 2023

CI is green, thank you @MichaelOrlov for launching CI again

@clalancette
Copy link
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@MichaelOrlov
Copy link
Contributor

Re-run Windows CI

  • Windows Build Status

MichaelOrlov
MichaelOrlov reviewed Nov 17, 2023
View reviewed changes
Copy link
Contributor

@MichaelOrlov MichaelOrlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahcorde What was a rationale for installing and exporting content of the include folder?
There only one file with visibility macros.
https://github.com/ros2/rosbag2/tree/rolling/rosbag2_storage_mcap/include/rosbag2_storage_mcap

We didn't do this originally for a reason. i.e. it doesn't make any sense.

I would appreciate if you will remove it from delta.

@ahcorde
Don't install include floder
87b4592 
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor Author

ahcorde commented Nov 17, 2023

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

clalancette
clalancette approved these changes Nov 17, 2023
View reviewed changes
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, but let's wait for @MichaelOrlov to approve before merging.

MichaelOrlov
MichaelOrlov approved these changes Nov 17, 2023
View reviewed changes
Copy link
Contributor

@MichaelOrlov MichaelOrlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@MichaelOrlov MichaelOrlov merged commit 7fcb703 into rolling Nov 17, 2023
14 checks passed
@delete-merged-branch delete-merged-branch bot deleted the ahcorde/humble/fix_1492 branch November 17, 2023 16:33
@MichaelOrlov
Copy link
Contributor

https://github.com/Mergifyio backport iron

@mergify Mergify
Copy link

mergify bot commented Nov 17, 2023 •
edited

backport iron

✅ Backports have been created

@MichaelOrlov
Copy link
Contributor

https://github.com/Mergifyio backport humble

mergify bot pushed a commit that referenced this pull request Nov 17, 2023
@ahcorde @mergify
Link and compile against rosbag2_storage_mcap: Fixed issue 1492 (#1496)
36a1a5a 
* Link and compile against rosbag2_storage_mcap: Fixed issue 1492

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

* Don't install include floder

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

---------

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 7fcb703)
@mergify mergify bot mentioned this pull request Nov 17, 2023
Merged
@mergify Mergify
Copy link

mergify bot commented Nov 17, 2023 •
edited

backport humble

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 17, 2023
@ahcorde @mergify
Link and compile against rosbag2_storage_mcap: Fixed issue 1492 (#1496)
867b13a 
* Link and compile against rosbag2_storage_mcap: Fixed issue 1492

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

* Don't install include floder

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>

---------

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 7fcb703)
@mergify mergify bot mentioned this pull request Nov 17, 2023
Merged
ahcorde added a commit that referenced this pull request Nov 20, 2023
@mergify @ahcorde
Link and compile against rosbag2_storage_mcap: Fixed issue 1492 (#1496)…
ca0f7fb 
… (#1498)

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 7fcb703)

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
ahcorde added a commit that referenced this pull request Nov 20, 2023
@mergify @ahcorde
Link and compile against rosbag2_storage_mcap: Fixed issue 1492 (#1496)…
83b356b 
… (#1497)

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 7fcb703)

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clalancette clalancette clalancette approved these changes

@MichaelOrlov MichaelOrlov MichaelOrlov approved these changes

@gbiggs gbiggs Awaiting requested review from gbiggs gbiggs is a code owner automatically assigned from ros2/tooling-reviewers

@jhdcs jhdcs Awaiting requested review from jhdcs jhdcs is a code owner automatically assigned from ros2/tooling-reviewers

Assignees

@ahcorde ahcorde

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ahcorde @MichaelOrlov @clalancette