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

Fix CI upgrade ROS docker (backport #489) #490

Merged
merged 2 commits into from
Mar 31, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 31, 2022

This is an automatic backport of pull request #489 done by Mergify.
Cherry-pick of 4a2e82c has failed:

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

You are currently cherry-picking commit 4a2e82c.
  (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:   .github/workflows/nightly.yml

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/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: Pablo Garrido <[email protected]>
(cherry picked from commit 4a2e82c)

# Conflicts:
#	.github/workflows/nightly.yml
@mergify mergify bot requested a review from pablogs9 as a code owner March 31, 2022 07:44
@mergify mergify bot added the conflicts label Mar 31, 2022
@mergify mergify bot mentioned this pull request Mar 31, 2022
Signed-off-by: Pablo Garrido <[email protected]>
@pablogs9 pablogs9 merged commit 9ddb47c into main Mar 31, 2022
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-489 branch March 31, 2022 07:46
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