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.

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

[20134] Change serialize function default behaviour to omit the data representation (backport #4131) #4154

Merged
merged 2 commits into from
Jan 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2023

This is an automatic backport of pull request #4131 done by Mergify.
Cherry-pick of 3625421 has failed:

On branch mergify/bp/2.12.x/pr-4131
Your branch is up to date with 'origin/2.12.x'.

You are currently cherry-picking commit 36254218a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/fastdds/dds/topic/TopicDataType.hpp
	modified:   src/cpp/CMakeLists.txt
	new file:   src/cpp/fastdds/topic/TopicDataType.cpp
	modified:   test/unittest/dds/subscriber/CMakeLists.txt
	modified:   test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
	modified:   test/unittest/dynamic_types/CMakeLists.txt
	modified:   test/unittest/xtypes/CMakeLists.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/publisher/CMakeLists.txt
	both modified:   test/unittest/dds/status/CMakeLists.txt
	both modified:   test/unittest/rtps/builtin/CMakeLists.txt
	both modified:   test/unittest/rtps/discovery/CMakeLists.txt
	both modified:   test/unittest/rtps/network/CMakeLists.txt
	both modified:   test/unittest/statistics/dds/CMakeLists.txt
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/xmlparser/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 18, 2023
@EduPonz EduPonz added this to the v2.12.2 milestone Dec 18, 2023
…tation (#4131)

* Refs #20134: Change serialize function default behaviour to omit the data representation

Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>

* Refs #20134: Separate header and sources files for TopicDataType

Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>

* Refs #20134: Add deprecation note

Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>

* Refs #20134: Uncrustify

Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>

---------

Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>
(cherry picked from commit 3625421)
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz added no-test Skip CI tests if PR marked with this label and removed no-test Skip CI tests if PR marked with this label labels Dec 18, 2023
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 18, 2023
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
@EduPonz EduPonz added skip-ci Automatically pass CI ci-pending PR which CI is running and removed ci-pending PR which CI is running skip-ci Automatically pass CI labels Dec 18, 2023
@EduPonz
Copy link
Member

EduPonz commented Dec 18, 2023

@richiprosima please test this

@EduPonz
Copy link
Member

EduPonz commented Dec 18, 2023

@richiprosima please test windows

@elianalf
Copy link
Contributor

@richiprosima please test mac

@JesusPoderoso
Copy link
Contributor

CI issues unrelated to the PR. Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Dec 24, 2023
@EduPonz EduPonz merged commit 6fde8ac into 2.12.x Jan 11, 2024
9 of 12 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4131 branch January 11, 2024 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants