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

[19089] Fix HelloWorld DataSharing example idl (backport #3714) #3884

Merged
merged 2 commits into from
Oct 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

This is an automatic backport of pull request #3714 done by Mergify.
Cherry-pick of 4fed0bd has failed:

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

You are currently cherry-picking commit 4fed0bd5d.
  (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:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.cxx
	modified:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.idl
	modified:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
	deleted by us:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp

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

* Refs #19089: Fix HelloWorld DataSharing example idl as bounded

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 28, 2023
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Sep 28, 2023
@JesusPoderoso JesusPoderoso added this to the v2.11.3 milestone Sep 28, 2023
@JesusPoderoso JesusPoderoso self-assigned this Sep 28, 2023
… fastcdr versions)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

@Mario-DL Mario-DL 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 Oct 9, 2023
@EduPonz EduPonz merged commit 223cb4f into 2.11.x Oct 24, 2023
2 of 6 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.11.x/pr-3714 branch October 24, 2023 10:30
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.

4 participants