Skip to content

Fix empy dep (backport #678)#679

Merged
pablogs9 merged 2 commits intohumblefrom
mergify/bp/humble/pr-678
Dec 1, 2023
Merged

Fix empy dep (backport #678)#679
pablogs9 merged 2 commits intohumblefrom
mergify/bp/humble/pr-678

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 1, 2023

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

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

You are currently cherry-picking commit fa7c612.
  (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:   config/freertos/esp32/create.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   .github/workflows/nightly.yml

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

* Fix empy dep

* Fix

* Install colcon

* Fix

(cherry picked from commit fa7c612)

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/nightly.yml
@mergify mergify Bot requested a review from pablogs9 as a code owner December 1, 2023 09:02
@mergify mergify Bot added the conflicts label Dec 1, 2023
@mergify mergify Bot mentioned this pull request Dec 1, 2023
@pablogs9 pablogs9 removed the conflicts label Dec 1, 2023
@pablogs9 pablogs9 merged commit 7c93d68 into humble Dec 1, 2023
@pablogs9 pablogs9 deleted the mergify/bp/humble/pr-678 branch December 1, 2023 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant