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

[19315] Allow participant profiles with no rtps tag (backport #3771) #3779

Merged
merged 1 commit into from
Oct 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2023

This is an automatic backport of pull request #3771 done by Mergify.
Cherry-pick of 9bcd313 has failed:

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

You are currently cherry-picking commit 9bcd31322.
  (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/XMLParser.cpp
	new file:   test/unittest/xmlparser/regressions/simple_participant_profiles_nok.xml
	new file:   test/unittest/xmlparser/regressions/simple_participant_profiles_ok.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 Aug 3, 2023
@EduPonz EduPonz added this to the v2.11.2 milestone Aug 7, 2023
@EduPonz
Copy link

EduPonz commented Aug 7, 2023

@richiprosima please test this

@EduPonz EduPonz modified the milestones: v2.11.2, v2.11.3 Aug 8, 2023
* Refs #19315: Allow participant profiles with no rtps tag

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19315: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19315: Apply suggestions 2

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
(cherry picked from commit 9bcd313)

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
@EduPonz EduPonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Aug 8, 2023
@JesusPoderoso
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

@EduPonz I think CI issues are not related to this PR backport content. Could you confirm this?

@JesusPoderoso
Copy link
Contributor

@EduPonz friendly ping

@EduPonz
Copy link

EduPonz commented Oct 2, 2023

@EduPonz friendly ping

They definitely aren't. Merging this

@EduPonz EduPonz merged commit 514cdf8 into 2.11.x Oct 2, 2023
5 of 6 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.11.x/pr-3771 branch October 2, 2023 06:16
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