Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

This make it possible to set board target and build for the RISC-V board on the ESP32 C6 Board.

The C6 is not added to the CI workflow in this PR.


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

* Support for the ESP32 C6 board
This make it possible to set board target and build for the RISC-V board on the ESP32 C6 Board.

* Add CI for ESP32 C6
The CI for ESP C6 follow the CI for ESP C3 as they both use RISC-V

* Add ESP32-C6 to  README

* Exclude the CI run for IDFv4.4 using esp32c6

(cherry picked from commit c5825cc)

# Conflicts:
#	.github/workflows/nightly.yml
@mergify mergify bot added the conflicts label Jan 29, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of c5825cc has failed:

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

You are currently cherry-picking commit c5825cc.
  (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/ci.yml
	modified:   README.md
	modified:   esp32_toolchain.cmake.in
	modified:   libmicroros.mk

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pablogs9 pablogs9 merged commit ed77882 into humble Jan 29, 2025
10 checks passed
@pablogs9 pablogs9 deleted the mergify/bp/humble/pr-274 branch January 29, 2025 07:57
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.

3 participants