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 broken rosidl_cli (backport #726) #728

Closed
wants to merge 1 commit into from
Closed

Fix broken rosidl_cli (backport #726) #728

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 16, 2024

This is an automatic backport of pull request #726 done by [Mergify](https://mergify.com).

@pablogs9 @mergify
Fix broken rosidl_cli (#726)
889cbaa 
* Fix broken rosidl_cli

Fix rosidl_pycommon

New approach

Upgrade pip

Remove upgrading sphynx

Add Zephyr virtual env

Fix IDF

Fix Zephyr

Fix

adf

* Fix idf

* Fix

* Update esp32

(cherry picked from commit 38ae4b7)

# Conflicts:
#	.github/workflows/ci.yml
#	config/freertos/esp32/create.sh
#	config/zephyr/generic/create.sh
@mergify mergify bot requested a review from pablogs9 as a code owner September 16, 2024 14:20
@mergify mergify bot added the conflicts label Sep 16, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 16, 2024

Cherry-pick of 38ae4b7 has failed:

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

You are currently cherry-picking commit 38ae4b7.
  (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/build.sh
	modified:   config/freertos/esp32/flash.sh
	modified:   config/zephyr/generic/build.sh
	modified:   config/zephyr/generic/flash.sh
	modified:   config/zephyr/generic/package.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   config/freertos/esp32/create.sh
	both modified:   config/zephyr/generic/create.sh

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

This was referenced Sep 16, 2024
Merged
Closed
@pablogs9 pablogs9 closed this Sep 16, 2024
@pablogs9 pablogs9 deleted the mergify/bp/iron/pr-726 branch September 16, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogs9 pablogs9 Awaiting requested review from pablogs9 pablogs9 is a code owner

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

Successfully merging this pull request may close these issues.
1 participant
@pablogs9