tools/ci.sh: Use IDF v4.4 as part of esp32 CI and build GENERIC_S3.

IDF v4.4 does not have an official release so for now use the latest
master.  Also remove building GENERIC with no options (all the other boards
are no-option builds), to keep CI time reasonable.

Signed-off-by: Damien George <damien@micropython.org>
pull/7810/head
Damien George 2021-09-16 22:22:40 +10:00
rodzic 80fe25689f
commit da4593f937
2 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -22,11 +22,11 @@ jobs:
- name: Build - name: Build
run: source tools/ci.sh && ci_esp32_build run: source tools/ci.sh && ci_esp32_build
build_idf43: build_idf44:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install packages - name: Install packages
run: source tools/ci.sh && ci_esp32_idf43_setup run: source tools/ci.sh && ci_esp32_idf44_setup
- name: Build - name: Build
run: source tools/ci.sh && ci_esp32_build run: source tools/ci.sh && ci_esp32_build

Wyświetl plik

@ -106,16 +106,14 @@ function ci_esp32_idf402_setup {
ci_esp32_setup_helper v4.0.2 ci_esp32_setup_helper v4.0.2
} }
function ci_esp32_idf43_setup { function ci_esp32_idf44_setup {
ci_esp32_setup_helper v4.3 ci_esp32_setup_helper master
} }
function ci_esp32_build { function ci_esp32_build {
source esp-idf/export.sh source esp-idf/export.sh
make ${MAKEOPTS} -C mpy-cross make ${MAKEOPTS} -C mpy-cross
make ${MAKEOPTS} -C ports/esp32 submodules make ${MAKEOPTS} -C ports/esp32 submodules
make ${MAKEOPTS} -C ports/esp32
make ${MAKEOPTS} -C ports/esp32 clean
make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
if [ -d $IDF_PATH/components/esp32c3 ]; then if [ -d $IDF_PATH/components/esp32c3 ]; then
make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3 make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
@ -123,6 +121,9 @@ function ci_esp32_build {
if [ -d $IDF_PATH/components/esp32s2 ]; then if [ -d $IDF_PATH/components/esp32s2 ]; then
make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2 make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
fi fi
if [ -d $IDF_PATH/components/esp32s3 ]; then
make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
fi
} }
######################################################################################## ########################################################################################