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.

Sign up for GitHub

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

Jump to bottom

[19089] Fix HelloWorld DataSharing example idl #3714

Merged
merged 2 commits into from
Sep 28, 2023
Merged

[19089] Fix HelloWorld DataSharing example idl #3714

merged 2 commits into from
Sep 28, 2023

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented Jul 13, 2023 •
edited
Loading

Description

One of the Data-sharing constraints is that the types must be bounded. In the Data-sharing helloworld example, it is forced to use datasharing but the IDL types do not use bounded strings.
This Pull Request updates IDL to use bounded string, and regenerates the types with the bounded string.

@Mergifyio backport 2.11.x 2.10.x 2.6.x

Fixes #3710

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • 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
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Changes are ABI compatible.
  • N/A 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.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@JesusPoderoso JesusPoderoso added the no-test Skip CI tests if PR marked with this label label Jul 13, 2023
@JesusPoderoso JesusPoderoso added this to the v2.11.2 milestone Jul 13, 2023
@JesusPoderoso JesusPoderoso self-assigned this Jul 13, 2023
@JesusPoderoso JesusPoderoso added the needs-review PR that is ready to be reviewed label Jul 13, 2023
@MiguelCompany MiguelCompany modified the milestones: v2.11.2, v2.12.0 Aug 7, 2023
@JesusPoderoso JesusPoderoso force-pushed the hotfix/bounded_string_datasharing_helloworldexample branch from 5febd8a to 071760f Compare September 19, 2023 10:28
@Mario-DL
Copy link
Member

Changes LGTM. I was wondering if the changes should be backported, in that case, the types should be re-generated with the corresponding fastddsgen version, what do you think @EduPonz ?. Also, if backporting is considered, it should be 2.11.x, 2.10.x and 2.6.x

@JLBuenoLopez
Copy link
Contributor

Changes LGTM. I was wondering if the changes should be backported, in that case, the types should be re-generated with the corresponding fastddsgen version, what do you think @EduPonz ?. Also, if backporting is considered, it should be 2.11.x, 2.10.x and 2.6.x

I think this should be backported and the types should be regenerated as suggested by Mario.

@JesusPoderoso
Copy link
Contributor Author

@Mergifyio backport 2.11.x 2.10.x 2.6.x

@mergify
Copy link
Contributor

mergify bot commented Sep 20, 2023 •
edited
Loading

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

@Mario-DL
Copy link
Member

@richiprosima please test this

@JesusPoderoso JesusPoderoso added ci-pending PR which CI is running and removed needs-review PR that is ready to be reviewed labels Sep 25, 2023
@JesusPoderoso JesusPoderoso force-pushed the hotfix/bounded_string_datasharing_helloworldexample branch from 071760f to 7a2e801 Compare September 25, 2023 09:46
@JesusPoderoso JesusPoderoso changed the base branch from master to feature/xcdr September 25, 2023 09:46
@richiware richiware force-pushed the feature/xcdr branch 3 times, most recently from 22a5ed4 to 9c76dcc Compare September 27, 2023 05:55
@JesusPoderoso JesusPoderoso force-pushed the hotfix/bounded_string_datasharing_helloworldexample branch from 7a2e801 to 991cc54 Compare September 27, 2023 07:31
Base automatically changed from feature/xcdr to master September 27, 2023 09:16
@JesusPoderoso JesusPoderoso force-pushed the hotfix/bounded_string_datasharing_helloworldexample branch 2 times, most recently from b214dab to 17ed249 Compare September 27, 2023 10:47
@JesusPoderoso JesusPoderoso force-pushed the hotfix/bounded_string_datasharing_helloworldexample branch from 17ed249 to a44dcb1 Compare September 27, 2023 10:50
@JesusPoderoso
Copy link
Contributor Author

@richiprosima please test this

2 similar comments
@Mario-DL
Copy link
Member

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor Author

@richiprosima please test this

EduPonz
EduPonz previously approved these changes Sep 27, 2023
View reviewed changes
Mario-DL
Mario-DL approved these changes Sep 27, 2023
View reviewed changes
Copy link
Member

@Mario-DL Mario-DL left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM with Green Windows v141 ci

@EduPonz EduPonz merged commit 4fed0bd into master Sep 28, 2023
7 of 8 checks passed
@EduPonz EduPonz deleted the hotfix/bounded_string_datasharing_helloworldexample branch September 28, 2023 05:17
mergify bot pushed a commit that referenced this pull request Sep 28, 2023
@JesusPoderoso @mergify
Fix HelloWorld DataSharing example idl (#3714)
6c9d30d 
* Refs #19089: Fix HelloWorld DataSharing example idl as bounded

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
mergify bot pushed a commit that referenced this pull request Sep 28, 2023
@JesusPoderoso @mergify
Fix HelloWorld DataSharing example idl (#3714)
bca38d9 
* Refs #19089: Fix HelloWorld DataSharing example idl as bounded

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
mergify bot pushed a commit that referenced this pull request Sep 28, 2023
@JesusPoderoso @mergify
Fix HelloWorld DataSharing example idl (#3714)
a195348 
* Refs #19089: Fix HelloWorld DataSharing example idl as bounded

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/C++/DDS/ContentFilteredTopicExample/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
This was referenced Sep 28, 2023
Merged
Merged
Closed
EduPonz pushed a commit that referenced this pull request Oct 24, 2023
@mergify @JesusPoderoso
Fix HelloWorld DataSharing example idl (backport #3714) (#3884)
223cb4f 
* Fix HelloWorld DataSharing example idl (#3714)

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

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp

* Refs #19089: Fix conflicts (regenerate types with proper fastddsgen & fastcdr versions)

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
Co-authored-by: Jesús Poderoso <[email protected]>
Co-authored-by: JesusPoderoso <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Oct 26, 2023
@mergify @JesusPoderoso
Fix HelloWorld DataSharing example idl (#3885)
6d06c00 
* Fix HelloWorld DataSharing example idl (#3714)

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

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp

* Refs #19089: Fix conflicts (regenerate types with proper fastddsgen & fastcdr versions)

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
Co-authored-by: Jesús Poderoso <[email protected]>
Co-authored-by: JesusPoderoso <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mario-DL Mario-DL Mario-DL approved these changes

@EduPonz EduPonz EduPonz left review comments

Assignees

@JesusPoderoso JesusPoderoso

Labels
ci-pending PR which CI is running no-test Skip CI tests if PR marked with this label
Projects
None yet
Milestone
v2.12.0
Development

Successfully merging this pull request may close these issues.
5 participants
@JesusPoderoso @Mario-DL @JLBuenoLopez @EduPonz @MiguelCompany