From da4593f937003e5593725bfa61f727d429a1e061 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Sep 2021 22:22:40 +1000
Subject: [PATCH] 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>
---
 .github/workflows/ports_esp32.yml | 4 ++--
 tools/ci.sh                       | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 09817ee126..de88de3755 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -22,11 +22,11 @@ jobs:
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
 
-  build_idf43:
+  build_idf44:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf43_setup
+      run: source tools/ci.sh && ci_esp32_idf44_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 4c216257d2..407ea04579 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -106,16 +106,14 @@ function ci_esp32_idf402_setup {
     ci_esp32_setup_helper v4.0.2
 }
 
-function ci_esp32_idf43_setup {
-    ci_esp32_setup_helper v4.3
+function ci_esp32_idf44_setup {
+    ci_esp32_setup_helper master
 }
 
 function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
     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
     if [ -d $IDF_PATH/components/esp32c3 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
@@ -123,6 +121,9 @@ function ci_esp32_build {
     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
 }
 
 ########################################################################################