Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 14, 2025

Exclude validation to enclave name in micro-ROS since it failed after applying micro-ROS/rmw_microxrcedds#318 to rmw.
Exclude also security options related code since it is not necessary.


This is an automatic backport of pull request #24 done by Mergify.

…nvironment from micro-ROS (#24)

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
(cherry picked from commit 7fbf5b9)

# Conflicts:
#	rcl/src/rcl/init.c
@mergify mergify bot added the conflicts label Mar 14, 2025
@mergify
Copy link
Author

mergify bot commented Mar 14, 2025

Cherry-pick of 7fbf5b9 has failed:

On branch mergify/bp/humble/pr-24
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 7fbf5b9.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rcl/src/rcl/init.c

no changes added to commit (use "git add" and/or "git commit -a")

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

@pablogs9 pablogs9 merged commit 3aed673 into humble Mar 14, 2025
1 check passed
4ntn added a commit that referenced this pull request May 5, 2025
…… (backport #24) (#26)

* exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24)

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
(cherry picked from commit 7fbf5b9)

# Conflicts:
#	rcl/src/rcl/init.c

* Fix conflicts

---------

Co-authored-by: Antón Casas <antoncasas@eprosima.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
4ntn added a commit that referenced this pull request Aug 4, 2025
…… (backport #24) (#26)

* exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24)

Signed-off-by: Antón Casas <antoncasas@eprosima.com>
(cherry picked from commit 7fbf5b9)

# Conflicts:
#	rcl/src/rcl/init.c

* Fix conflicts

---------

Co-authored-by: Antón Casas <antoncasas@eprosima.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants