Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 25, 2025

Description

This removes @feed operations from the RPC example, since this becomes a Fast DDS Pro feature

@Mergifyio backport 2.2.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • N/A: 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
  • Changes are API compatible.
  • N/A: 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.
  • 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 #256 done by [Mergify](https://mergify.com).

* Refs #23701. Remove feed operations from example.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #23703. Apply suggestion.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e143c3b)

# Conflicts:
#	fastdds_python_examples/RPCExample/generated_code/calculator.i
#	fastdds_python_examples/RPCExample/generated_code/calculatorClient.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorPubSubTypes.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorServer.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorServer.hpp
#	fastdds_python_examples/RPCExample/generated_code/calculatorServerImpl.hpp
#	fastdds_python_examples/RPCExample/generated_code/calculatorTypeObjectSupport.cxx
@mergify mergify bot added the conflicts label Sep 25, 2025
Copy link
Author

mergify bot commented Sep 25, 2025

Cherry-pick of e143c3b has failed:

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

You are currently cherry-picking commit e143c3b.
  (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:   fastdds_python_examples/RPCExample/CalculatorExample.py
	modified:   fastdds_python_examples/RPCExample/calculator.idl
	modified:   fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt
	modified:   fastdds_python_examples/RPCExample/generated_code/calculator.hpp
	modified:   fastdds_python_examples/RPCExample/generated_code/calculatorCdrAux.ipp
	modified:   fastdds_python_examples/RPCExample/generated_code/calculatorClient.hpp
	modified:   fastdds_python_examples/RPCExample/generated_code/calculatorPubSubTypes.hpp
	modified:   fastdds_python_examples/RPCExample/generated_code/calculator_details.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculator.i
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorClient.cxx
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorPubSubTypes.cxx
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorServer.cxx
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorServer.hpp
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorServerImpl.hpp
	both modified:   fastdds_python_examples/RPCExample/generated_code/calculatorTypeObjectSupport.cxx

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

@MiguelCompany MiguelCompany self-requested a review September 25, 2025 10:59
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 25, 2025
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the mergify/bp/2.2.x/pr-256 branch from 516f05c to b70d9c4 Compare September 25, 2025 12:16
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany September 25, 2025 12:17
@MiguelCompany MiguelCompany merged commit eb71379 into 2.2.x Sep 25, 2025
8 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.2.x/pr-256 branch September 25, 2025 13:03
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.

1 participant