Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 20:20:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

esp32/boards: Merge manifest_release modules into standard manifest.

Browse Source 
Having two separate manifests is confusing.  It's simpler to have the daily
builds use the same configuration as the stable, release builds.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2022-08-30 11:14:32 +10:00
parent 9a826e0f24
commit 730e975091
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/autobuild/build-boards.sh
View File

@@ -83,12 +83,7 @@ function build_esp32_boards {
if idf.py --version | grep -q v4.2; then
if [ $mcu = esp32 ]; then
# build standard esp32-based boards with IDF v4.2
if echo $board_json | grep -q GENERIC; then
# traditionally, GENERIC and GENERIC_SPIRAM boards used manifest_release.py
MICROPY_AUTOBUILD_MAKE="$MICROPY_AUTOBUILD_MAKE FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py" build_board $board_json $fw_tag $dest_dir bin elf map
else
build_board $board_json $fw_tag $dest_dir bin elf map
fi
build_board $board_json $fw_tag $dest_dir bin elf map
fi
else
if [ $mcu != esp32 ]; then