From a9bbf7083ef6b79cf80bdbf34984d847a6c4aae9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Apr 2021 12:33:17 +1000
Subject: [PATCH] tools/ci.sh: Build esp32 using IDF v4.0.2 and v4.3.

To test different IDF's, and also test building the GENERIC_S2 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 13 +++++++++++--
 tools/ci.sh                       | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 0ad3f87a25..09817ee126 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -13,11 +13,20 @@ on:
       - 'ports/esp32/**'
 
 jobs:
-  build:
+  build_idf402:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_setup
+      run: source tools/ci.sh && ci_esp32_idf402_setup
+    - name: Build
+      run: source tools/ci.sh && ci_esp32_build
+
+  build_idf43:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp32_idf43_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 3ce96a96a9..c018b55002 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -82,19 +82,27 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-function ci_esp32_setup {
+function ci_esp32_setup_helper {
     git clone https://github.com/espressif/esp-idf.git
-    git -C esp-idf checkout v4.0.2
+    git -C esp-idf checkout $1
     git -C esp-idf submodule update --init \
         components/bt/controller/lib \
         components/bt/host/nimble/nimble \
-        components/esp_wifi/lib_esp32 \
+        components/esp_wifi \
         components/esptool_py/esptool \
         components/lwip/lwip \
         components/mbedtls/mbedtls
     ./esp-idf/install.sh
 }
 
+function ci_esp32_idf402_setup {
+    ci_esp32_setup_helper v4.0.2
+}
+
+function ci_esp32_idf43_setup {
+    ci_esp32_setup_helper v4.3-beta2
+}
+
 function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
@@ -102,6 +110,9 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32
     make ${MAKEOPTS} -C ports/esp32 clean
     make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake
+    if [ -d $IDF_PATH/components/esp32s2 ]; then
+        make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
+    fi
 }
 
 ########################################################################################