Skip to content

[Foxy] revert #1198 "rosbag2_storage_mcap: merge into rosbag2"#1347

Merged
MichaelOrlov merged 1 commit intofoxyfrom
morlov/revert_rosbag2_storage_mcap_merge
May 26, 2023
Merged

[Foxy] revert #1198 "rosbag2_storage_mcap: merge into rosbag2"#1347
MichaelOrlov merged 1 commit intofoxyfrom
morlov/revert_rosbag2_storage_mcap_merge

Conversation

@MichaelOrlov
Copy link
Copy Markdown
Contributor

@MichaelOrlov MichaelOrlov commented May 24, 2023 •
edited
Loading

This reverts commit e457d92.

@MichaelOrlov MichaelOrlov force-pushed the morlov/revert_rosbag2_storage_mcap_merge branch from 8a00c97 to 4eac1b6 Compare May 24, 2023 01:10
@MichaelOrlov MichaelOrlov changed the title Revert [Foxy] rosbag2_storage_mcap: merge into rosbag2 [Foxy] revert #1198 "rosbag2_storage_mcap: merge into rosbag2" May 24, 2023
@MichaelOrlov MichaelOrlov marked this pull request as ready for review May 24, 2023 01:12
@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023

Gist: https://gist.githubusercontent.com/MichaelOrlov/b5fe812945b757b423d4b3d855baaf8c/raw/ad6a580f2d4b0308a57ff7ba3d75df08791ed3ee/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_storage rosbag2_storage_default_plugins rosbag2_storage_mcap rosbag2_tests rosbag2_cpp ros2bag rosbag2_transport
TEST args: --packages-above rosbag2_storage rosbag2_storage_default_plugins rosbag2_storage_mcap rosbag2_tests rosbag2_cpp ros2bag rosbag2_transport
ROS Distro: foxy
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12105

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

@MichaelOrlov MichaelOrlov mentioned this pull request May 24, 2023
Merged
@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023

Re-run with Focal
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12106

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

@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023

Re-run CI with removed rosbag2_storage_mcap from the list of packages to build and test, since this package was completely removed.
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/12107

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

@emersonknapp
Copy link
Copy Markdown
Collaborator

emersonknapp commented May 24, 2023

Did those Windows warnings already exist on Foxy build before the original change?

@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023

It will be addressed in #1349

@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023

I have tested it on my local setup with Windows

@emersonknapp
Copy link
Copy Markdown
Collaborator

emersonknapp commented May 24, 2023

It will be addressed in #1349

Not the test failure, there are MSBuild compiler warnings https://ci.ros2.org/job/ci_windows/19535/msbuild/

@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 24, 2023 •
edited
Loading

Not the test failure, there are MSBuild compiler warnings https://ci.ros2.org/job/ci_windows/19535/msbuild/

Yes, they were present before.
This type of warning 'YAML_CPP_DLL': macro redefinition is a bit annoying and as far as recall we fixed them on rolling with multiple iterations #964 but not on Foxy.

@MichaelOrlov MichaelOrlov mentioned this pull request May 26, 2023
Closed
@MichaelOrlov MichaelOrlov force-pushed the morlov/revert_rosbag2_storage_mcap_merge branch from 4eac1b6 to c28cfd6 Compare May 26, 2023 17:35
@morlov-apexai
Revert "[Foxy] rosbag2_storage_mcap: merge into rosbag2 repo (backport …
5a0ecf0 
…#1163) (#1198)"

This reverts commit e457d92.

Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
@MichaelOrlov MichaelOrlov force-pushed the morlov/revert_rosbag2_storage_mcap_merge branch from c28cfd6 to 5a0ecf0 Compare May 26, 2023 19:52
@MichaelOrlov
Copy link
Copy Markdown
Contributor Author

MichaelOrlov commented May 26, 2023

re-run CI after rebase

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

@MichaelOrlov MichaelOrlov mentioned this pull request May 26, 2023
Closed
@MichaelOrlov MichaelOrlov merged commit 67e2ebf into foxy May 26, 2023
@delete-merged-branch delete-merged-branch bot deleted the morlov/revert_rosbag2_storage_mcap_merge branch May 26, 2023 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emersonknapp emersonknapp emersonknapp approved these changes

@clalancette clalancette Awaiting requested review from clalancette

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MichaelOrlov @emersonknapp @morlov-apexai