diff options
| author | Damien George <damien@micropython.org> | 2023-05-17 14:15:10 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-06-23 15:34:53 +1000 |
| commit | 6a9db521eda2f62766749d84244c70fd2073d4a0 (patch) | |
| tree | 747d6e894bcf2bed383f3bb2e958e1313b58b557 | |
| parent | 68e0e889b43c4c381515691b689b5f02f037063f (diff) | |
github/workflows: Update esp32 CI to use IDF v5.0.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | .github/workflows/ports_esp32.yml | 13 | ||||
| -rwxr-xr-x | tools/ci.sh | 38 |
2 files changed, 7 insertions, 44 deletions
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml index 6fc009d4f..2cc9f592b 100644 --- a/.github/workflows/ports_esp32.yml +++ b/.github/workflows/ports_esp32.yml @@ -18,20 +18,11 @@ concurrency: cancel-in-progress: true jobs: - build_idf402: + build_idf50: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Install packages - run: source tools/ci.sh && ci_esp32_idf402_setup - - name: Build - run: source tools/ci.sh && ci_esp32_build - - build_idf44: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - name: Install packages - run: source tools/ci.sh && ci_esp32_idf44_setup + run: source tools/ci.sh && ci_esp32_idf50_setup - name: Build run: source tools/ci.sh && ci_esp32_build diff --git a/tools/ci.sh b/tools/ci.sh index 986fe8f07..84ca83e9b 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -115,35 +115,13 @@ function ci_cc3200_build { ######################################################################################## # ports/esp32 -function ci_esp32_setup_helper { +function ci_esp32_idf50_setup { pip3 install pyelftools git clone https://github.com/espressif/esp-idf.git - git -C esp-idf checkout $1 - git -C esp-idf submodule update --init \ - components/bt/host/nimble/nimble \ - components/esp_wifi \ - components/esptool_py/esptool \ - components/lwip/lwip \ - components/mbedtls/mbedtls - if [ -d esp-idf/components/bt/controller/esp32 ]; then - git -C esp-idf submodule update --init \ - components/bt/controller/lib_esp32 \ - components/bt/controller/lib_esp32c3_family - else - git -C esp-idf submodule update --init \ - components/bt/controller/lib - fi + git -C esp-idf checkout v5.0.2 ./esp-idf/install.sh } -function ci_esp32_idf402_setup { - ci_esp32_setup_helper v4.0.2 -} - -function ci_esp32_idf44_setup { - ci_esp32_setup_helper v4.4.2 -} - function ci_esp32_build { source esp-idf/export.sh make ${MAKEOPTS} -C mpy-cross @@ -151,15 +129,9 @@ function ci_esp32_build { make ${MAKEOPTS} -C ports/esp32 \ USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \ FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py - if [ -d $IDF_PATH/components/esp32c3 ]; then - make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3 - fi - if [ -d $IDF_PATH/components/esp32s2 ]; then - make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2 - fi - if [ -d $IDF_PATH/components/esp32s3 ]; then - make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3 - fi + make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3 + make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2 + make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3 # Test building native .mpy with xtensawin architecture. ci_native_mpy_modules_build xtensawin |