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

[21660] Add flow_control, rtps, custom_payload_pool and content_filter to windows example ci testing (backport #5480) #5491

Open
wants to merge 1 commit into
base: 3.0.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

Description

This PR adds the flow_control, rtps, custom_payload_pool and content_filter to windows example ci testing.
In particular, it

  • Adds the required infrastructure to include environment args splitting them to be recognized as different argv in windows.
  • Includes a new matched argument to the rtps example to wait for discovery before publishing.
  • Adds a new argument samples to the subscriber content filter as a finish condition when it gets unmatched.

Note: In the content filter example the PUB_ARGS was removed since it was not being used in the compose file.

@Mergifyio backport 3.1.x 3.0.x

Contributor Checklist

  • [X ] Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5480 done by [Mergify](https://mergify.com).

…` to windows example ci testing (#5480)

* Refs #21660: Flow controller example

Signed-off-by: Mario-DL <[email protected]>

* Refs #21660: RTPS example

Signed-off-by: Mario-DL <[email protected]>

* Refs #21660: Custom PayloadPool example

Signed-off-by: Mario-DL <[email protected]>

* Refs #21660: Additional cmake vars for configuring extra arguments lists

Signed-off-by: Mario-DL <[email protected]>

* Refs #21660: Content Filter example

Signed-off-by: Mario-DL <[email protected]>

* Refs #21660: Add examples to CMakeLists.txt

Signed-off-by: Mario-DL <[email protected]>

---------

Signed-off-by: Mario-DL <[email protected]>
(cherry picked from commit 0deeb14)

# Conflicts:
#	test/examples/CMakeLists.txt
#	test/examples/content_filter.compose.yml
#	test/examples/custom_payload_pool.compose.yml
#	test/examples/rtps.compose.yml
Copy link
Contributor Author

mergify bot commented Dec 13, 2024

Cherry-pick of 0deeb14 has failed:

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

You are currently cherry-picking commit 0deeb148b.
  (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/content_filter/CLIParser.hpp
	modified:   examples/cpp/content_filter/SubscriberApp.cpp
	modified:   examples/cpp/content_filter/SubscriberApp.hpp
	modified:   examples/cpp/rtps/CLIParser.hpp
	modified:   examples/cpp/rtps/WriterApp.cpp
	modified:   examples/cpp/rtps/WriterApp.hpp
	modified:   test/examples/test_content_filter.py
	modified:   test/examples/test_custom_payload_pool.py
	modified:   test/examples/test_flow_control.py
	modified:   test/examples/test_rtps.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/examples/CMakeLists.txt
	both modified:   test/examples/content_filter.compose.yml
	both modified:   test/examples/custom_payload_pool.compose.yml
	both modified:   test/examples/rtps.compose.yml

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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 13, 2024
@Mario-DL Mario-DL added this to the v3.0.2 milestone Dec 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant