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

Fix complex member printing for DynamicDataHelper (backport #2957) #2965

Merged
merged 3 commits into from
Sep 30, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 22, 2022

This is an automatic backport of pull request #2957 done by Mergify.
Cherry-pick of 78473a0 has failed:

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

You are currently cherry-picking commit 78473a0de.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/dynamic-types/DynamicDataHelper.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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

* DynamicDataHelper::print can print Sequences as well as Arrays
Signed-off-by: Will Stott <willstott101@gmail.com>

* Fix complex member printing

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Clean up prints

Signed-off-by: methylDragon <methylDragon@gmail.com>

* Fix FastDDS windows CI error

Signed-off-by: methylDragon <methylDragon@gmail.com>

Signed-off-by: methylDragon <methylDragon@gmail.com>
Co-authored-by: Will Stott <willstott101@gmail.com>
(cherry picked from commit 78473a0)

# Conflicts:
#	src/cpp/dynamic-types/DynamicDataHelper.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 22, 2022
@MiguelCompany MiguelCompany added no-test Skip CI tests if PR marked with this label no-aarch Skip build & test for aarch64 labels Sep 22, 2022
@MiguelCompany
Copy link
Member

@methylDragon Would you mind resolving the conflicts here?

@methylDragon
Copy link
Contributor

I think that looks like the only conflict?

Co-authored-by: methylDragon <methylDragon@gmail.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Sep 28, 2022
@methylDragon
Copy link
Contributor

Looks like uncrustify is unhappy?

There's another uncrustify warning occuring in line 61. I don't have access to edit that.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member

Uncrustify is now happy, and build was successful. Going in.

@MiguelCompany MiguelCompany merged commit 03fdb06 into 2.6.x Sep 30, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-2957 branch September 30, 2022 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-aarch Skip build & test for aarch64 no-test Skip CI tests if PR marked with this label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants