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

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

Merged
merged 1 commit into from
Oct 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 3, 2024

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.

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

…ve icons on windows uninstall (#5140)

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

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* TMP commit for testing

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

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

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #21564: Change expected xsd installation path

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Revert "TMP commit for testing"

This reverts commit ac18b8a.

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 6bb7e9a)
@JesusPoderoso JesusPoderoso added this to the v3.0.2 milestone Oct 4, 2024
@JesusPoderoso JesusPoderoso added the no-test Skip CI tests if PR marked with this label label Oct 4, 2024
@JesusPoderoso JesusPoderoso self-requested a review October 4, 2024 05:45
@github-actions github-actions bot added the ci-pending PR which CI is running label Oct 4, 2024
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

@Mario-DL
Copy link
Member

Mario-DL commented Oct 4, 2024

Backport branch has diverged from the one in Fast DDS docs so I guess we can merge this one and the order CI in the Docs one

@JesusPoderoso
Copy link
Contributor

Docs CI failed due to missmatching branch names.
Manual CI run with the correct branches passed here
Ready to merge!

@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 7, 2024
@MiguelCompany MiguelCompany merged commit 25f12b5 into 3.0.x Oct 7, 2024
14 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.0.x/pr-5140 branch October 7, 2024 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

3 participants