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

[21564] [21666] Change xsd files installation directory to share/fastdds and remove icons on windows uninstall #5140

Merged
merged 5 commits into from
Oct 3, 2024
Merged

[21564] [21666] Change xsd files installation directory to share/fastdds and remove icons on windows uninstall #5140

merged 5 commits into from
Oct 3, 2024

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Aug 6, 2024 •
edited by JesusPoderoso
Loading

Description

This other PR:

  • Moves fastdds_profiles.xsd and fastdds_static_discovery.xsd installation directory to .../share/fastdds (previously in .../share) .
  • Removes redundant cmake installation of fastdds_profiles.xsd within the /tools CMakeLists.txt.

IMPORTANT this PR must be merged along with:

@Mergifyio backport 3.0.x

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 Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • 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.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • N/A 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.

@Mario-DL Mario-DL added the no-test Skip CI tests if PR marked with this label label Aug 6, 2024
@Mario-DL Mario-DL added this to the v3.0.1 milestone Aug 6, 2024
@JesusPoderoso

This comment was marked as resolved.

Sign in to view
JesusPoderoso

This comment was marked as outdated.

Sign in to view

@rsanchez15 rsanchez15 modified the milestones: v3.0.1, v3.0.2 Sep 4, 2024
@rsanchez15 rsanchez15 changed the title [21366] Change xsd files installation directory to share/fastdds [21564] Change xsd files installation directory to share/fastdds Sep 4, 2024
@MiguelCompany MiguelCompany modified the milestones: v3.0.2, v3.1.0 Oct 2, 2024
@Mario-DL Mario-DL changed the title [21564] Change xsd files installation directory to share/fastdds [21564] [21666] Change xsd files installation directory to share/fastdds and remove icons on windows uninstall Oct 3, 2024
@Mario-DL Mario-DL marked this pull request as ready for review October 3, 2024 08:19
@Mario-DL Mario-DL requested review from richiprosima and removed request for richiprosima October 3, 2024 08:19
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 3, 2024
JesusPoderoso
JesusPoderoso approved these changes Oct 3, 2024
View reviewed changes
Copy link
Contributor

@JesusPoderoso JesusPoderoso 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 and green local testing

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Oct 3, 2024
@JesusPoderoso
Copy link
Contributor

@Mergifyio backport 3.0.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Oct 3, 2024 •
edited
Loading

backport 3.0.x

✅ Backports have been created

@MiguelCompany MiguelCompany merged commit 6bb7e9a into master Oct 3, 2024
14 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/xsd-installdir branch October 3, 2024 15:09
mergify bot pushed a commit that referenced this pull request Oct 3, 2024
@Mario-DL @mergify
Change xsd files installation directory to share/fastdds and remo…
7e36574 
…ve icons on windows uninstall (#5140)

* Refs #21366: Change xsd installation directory to .../share/fastdds

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

* TMP commit for testing

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

* Refs #21564: Remove redundant installation of xsd file again

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

* Refs #21564: Change expected xsd installation path

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

* Revert "TMP commit for testing"

This reverts commit ac18b8a.

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 6bb7e9a)
@mergify mergify bot mentioned this pull request Oct 3, 2024
Merged
8 tasks
MiguelCompany pushed a commit that referenced this pull request Oct 7, 2024
@mergify @Mario-DL
Change xsd files installation directory to share/fastdds and remo…
25f12b5 
…ve icons on windows uninstall (#5140) (#5302)

* Refs #21366: Change xsd installation directory to .../share/fastdds

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

* TMP commit for testing

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

* Refs #21564: Remove redundant installation of xsd file again

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

* Refs #21564: Change expected xsd installation path

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

* Revert "TMP commit for testing"

This reverts commit ac18b8a.

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 6bb7e9a)

Co-authored-by: Mario Domínguez López <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JesusPoderoso JesusPoderoso JesusPoderoso approved these changes

Assignees
No one assigned
Labels
no-test Skip CI tests if PR marked with this label ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v3.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@Mario-DL @JesusPoderoso @rsanchez15 @MiguelCompany