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

Add "license" option to all uses of ros2 pkg create. (backport #4070) #4073

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2023

This is an automatic backport of pull request #4070 done by Mergify.
Cherry-pick of 8957909 has failed:

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

You are currently cherry-picking commit 8957909.
  (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:   source/How-To-Guides/Developing-a-ROS-2-Package.rst
	modified:   source/Tutorials/Advanced/FastDDS-Configuration.rst
	modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst
	modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-Py.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Creating-Your-First-ROS2-Package.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Custom-ROS2-Interfaces.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Pluginlib.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Single-Package-Define-And-Use-Interface.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-Python.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Publisher-And-Subscriber.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Py-Service-And-Client.rst
	modified:   source/Tutorials/Intermediate/Launch/Launch-system.rst
	modified:   source/Tutorials/Intermediate/Launch/Using-Substitutions.rst
	modified:   source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-URDF-with-Robot-State-Publisher.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-Python.rst

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from clalancette and audrow as code owners December 20, 2023 14:36
@mergify mergify bot added the conflicts label Dec 20, 2023
This is our best practice for a while and avoides a warning
when running "ros2 pkg create".

Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit 8957909)
@clalancette clalancette force-pushed the mergify/bp/iron/pr-4070 branch from b6317a4 to cb6a53c Compare December 20, 2023 14:38
@clalancette clalancette merged commit be6bba9 into iron Dec 20, 2023
3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/iron/pr-4070 branch December 20, 2023 14:42
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.

1 participant