From aa3d6b6aa5ec9fdf15b5c2d30a1c9f9c9064cd3c Mon Sep 17 00:00:00 2001 From: Damien George Date: Sun, 14 Feb 2021 10:28:05 +1100 Subject: [PATCH] tools/ci.sh: Change esp32 CI to work with idf.py and IDF v4.0.2. Signed-off-by: Damien George --- .github/workflows/ports_esp32.yml | 19 +++------------ tools/ci.sh | 40 ++++++++++--------------------- 2 files changed, 15 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml index 041074557e..0ad3f87a25 100644 --- a/.github/workflows/ports_esp32.yml +++ b/.github/workflows/ports_esp32.yml @@ -13,24 +13,11 @@ on: - 'ports/esp32/**' jobs: - idf3_build: + build: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Install packages - run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH + run: source tools/ci.sh && ci_esp32_setup - name: Build - env: - IDF_PATH: ${{ github.workspace }}/esp-idf - run: source tools/ci.sh && ci_esp32_idf3_build - - idf4_build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Install packages - run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH - - name: Build - env: - IDF_PATH: ${{ github.workspace }}/esp-idf - run: source tools/ci.sh && ci_esp32_idf4_build + run: source tools/ci.sh && ci_esp32_build diff --git a/tools/ci.sh b/tools/ci.sh index 8661f532ef..4f99551468 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -82,38 +82,22 @@ function ci_cc3200_build { ######################################################################################## # ports/esp32 -function ci_esp32_idf3_setup { - sudo pip3 install pyserial 'pyparsing<2.4' - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf - +function ci_esp32_setup { git clone https://github.com/espressif/esp-idf.git + git -C esp-idf checkout v4.0.2 + git -C esp-idf submodule update --init \ + components/bt/controller/lib \ + components/bt/host/nimble/nimble \ + components/esp_wifi/lib_esp32 \ + components/esptool_py/esptool \ + components/lwip/lwip \ + components/mbedtls/mbedtls + ./esp-idf/install.sh } -function ci_esp32_idf3_path { - echo $(pwd)/xtensa-esp32-elf/bin -} - -function ci_esp32_idf3_build { +function ci_esp32_build { + source esp-idf/export.sh make ${MAKEOPTS} -C mpy-cross - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3) - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt - make ${MAKEOPTS} -C ports/esp32 submodules - make ${MAKEOPTS} -C ports/esp32 -} - -function ci_esp32_idf4_setup { - sudo pip3 install pyserial 'pyparsing<2.4' - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf - - git clone https://github.com/espressif/esp-idf.git -} - -function ci_esp32_idf4_path { - echo $(pwd)/xtensa-esp32-elf/bin -} - -function ci_esp32_idf4_build { - make ${MAKEOPTS} -C mpy-cross - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3) - git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls make ${MAKEOPTS} -C ports/esp32 submodules make ${MAKEOPTS} -C ports/esp32 }