[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
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

Fix url in setup.py (backport #413) #415

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Fix url in setup.py (backport #413) #415

merged 2 commits into from
Sep 25, 2024

Conversation

mergify[bot]
Copy link
@mergify mergify bot commented Sep 25, 2024

resolves #412

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

@huweiATgithub @mergify
Fix url in setup.py (#413)
a8e4735 
Signed-off-by: Wei Hu <whuae@connect.ust.hk>
(cherry picked from commit edb6376)

# Conflicts:
#	launch_ros/setup.py
#	ros2launch/setup.py
#	test_launch_ros/setup.py
@mergify mergify bot added the conflicts label Sep 25, 2024
@mergify Mergify
Copy link
Author
mergify bot commented Sep 25, 2024

Cherry-pick of edb6376 has failed:

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

You are currently cherry-picking commit edb6376.
  (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:   launch_ros/setup.py
	both modified:   ros2launch/setup.py
	both modified:   test_launch_ros/setup.py

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

@mergify mergify bot mentioned this pull request Sep 25, 2024
Merged
@ahcorde
Copy link
Contributor
ahcorde commented Sep 25, 2024

Pulls: #415
Gist: https://gist.githubusercontent.com/ahcorde/36db5b7ab84621c34379f2d5321aabf7/raw/b7f7ec6663b484fbf87564678e66d1b03b464cdc/ros2.repos
BUILD args: --packages-up-to launch_ros ros2launch test_launch_ros --packages-above-and-dependencies launch_ros ros2launch test_launch_ros
TEST args: --packages-select launch_ros ros2launch test_launch_ros --packages-above launch_ros ros2launch test_launch_ros
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14610

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde
Fix merge
3de1e6a 
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor
ahcorde commented Sep 25, 2024

Pulls: #415
Gist: https://gist.githubusercontent.com/ahcorde/333430868a1299138b410a51d313cc35/raw/b7f7ec6663b484fbf87564678e66d1b03b464cdc/ros2.repos
BUILD args: --packages-up-to launch_ros ros2launch test_launch_ros --packages-above-and-dependencies launch_ros ros2launch test_launch_ros
TEST args: --packages-select launch_ros ros2launch test_launch_ros --packages-above launch_ros ros2launch test_launch_ros
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14614

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde ahcorde merged commit 593d33a into humble Sep 25, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ahcorde @huweiATgithub