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

[19851] Fix missing mandatory attribute check in XML parser struct type (backport #3995) #4008

Merged
merged 2 commits into from
Dec 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2023

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

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

You are currently cherry-picking commit b10bfe651.
  (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:   src/cpp/rtps/xmlparser/XMLDynamicParser.cpp
	new file:   test/unittest/xmlparser/regressions/19851_profile_bin.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/xmlparser/XMLParserTests.cpp

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 Nov 13, 2023
@JesusPoderoso JesusPoderoso added this to the v2.6.7 milestone Nov 13, 2023
* Refs #19851: Fix missing mandatory attribute check

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

* Refs #19851: Apply rev suggestions

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

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit b10bfe6)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-3995 branch from a9a5d7d to 6a08b79 Compare November 13, 2023 15:22
@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Nov 13, 2023
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

JesusPoderoso
JesusPoderoso previously approved these changes Nov 28, 2023
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@MiguelCompany
Copy link
Member

@richiprosima Please test this

1 similar comment
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit b35cad1 into 2.6.x Dec 2, 2023
2 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-3995 branch December 2, 2023 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants