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

Update CI to use packages (backport #31) #35

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 9, 2023

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

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

You are currently cherry-picking commit d93a29a.
  (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/build-and-test.sh
	modified:   .github/workflows/ros2-ci.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: point_cloud_transport.repos

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

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit d93a29a)

# Conflicts:
#	point_cloud_transport.repos
@mergify mergify bot added the conflicts label Oct 9, 2023
@mergify mergify bot mentioned this pull request Oct 9, 2023
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde ahcorde merged commit 1bafc35 into humble Oct 9, 2023
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-31 branch October 9, 2023 14:39
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