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

[22463] Fix Discovery CLI Tool in Windows (No privileges) (backport #5493) #5509

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2024

Description

When Fast DDS is compiled without admin privileges, no symlink is created to link to the fast-discovery-server-1.0.1.exe file. In this case, an alternative .bat is created to call the tool. However, the .bat file contains an error and fails to properly call the tool because it adds an unknown parameter as argument. To solve this, the .bat file was removed and the .exe file is called from the Python script directly. This gives more control over the tool as it does not bypass the Python script when compiling without admin privileges.

@Mergifyio backport 3.1.x 3.0.x

Contributor Checklist

  • 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

  • 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)

  • 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 #5493 done by [Mergify](https://mergify.com).

* Refs #22463: Add test to check proper link between python and cpp files

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

* Refs #22463: Remove .bat.in and call .exe from python

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

* Refs #22463: Apply suggestions

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

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 2cdc2d9)

# Conflicts:
#	tools/fastdds/discovery/parser.py
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 18, 2024
Copy link
Contributor Author

mergify bot commented Dec 18, 2024

Cherry-pick of 2cdc2d9 has failed:

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

You are currently cherry-picking commit 2cdc2d96.
  (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:   .github/workflows/reusable-mac-ci.yml
	modified:   .github/workflows/reusable-ubuntu-ci.yml
	modified:   .github/workflows/reusable-windows-ci.yml
	modified:   test/system/tools/fastdds/CMakeLists.txt
	modified:   test/system/tools/fastdds/tests.py
	modified:   tools/fds/CMakeLists.txt
	deleted:    tools/fds/fast-discovery-server.bat.in

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/fastdds/discovery/parser.py

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 added this to the v3.1.2 milestone Dec 18, 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.

2 participants