From 72a31a62c7cb74a7e1262f94e72d26bd77d21b71 Mon Sep 17 00:00:00 2001
From: "Michael (XIAO Xufeng)" <xiaoxufeng@espressif.com>
Date: Thu, 24 Sep 2020 22:49:12 +0800
Subject: [PATCH] ci: add esp32s3 into template app build

---
 tools/ci/build_template_app.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh
index 73195b1b31..be09b565dc 100755
--- a/tools/ci/build_template_app.sh
+++ b/tools/ci/build_template_app.sh
@@ -24,7 +24,7 @@ gen_configs() {
     echo "CONFIG_COMPILER_OPTIMIZATION_PERF=y" > esp-idf-template/sdkconfig.ci.O2
     echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF=y" >> esp-idf-template/sdkconfig.ci.O2
 
-    # Only built in make, because CMake already build this config in pre_build job
+    # This part will be built in earlier stage (pre_build job) with only cmake. Built with make in later stage
     # CONFIG_COMPILER_OPTIMIZATION_DEFAULT with flag -Og
     echo "CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y" > esp-idf-template/sdkconfig.ci2.Og
     echo "CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y" >> esp-idf-template/sdkconfig.ci2.Og
@@ -72,18 +72,18 @@ build_stage2() {
     CONFIG_STR=$(get_config_str sdkconfig.ci.*=)
     search_cmake esp32 ${CONFIG_STR}
     search_cmake esp32s2 ${CONFIG_STR}
+    search_cmake esp32s3 ${CONFIG_STR}
 
     CONFIG_STR=$(get_config_str sdkconfig.ci.*= sdkconfig.ci2.*=)
     search_make esp32 ${CONFIG_STR}
-    search_make esp32s2 ${CONFIG_STR}
 
     build build_list_1.json
 
     CONFIG_STR=$(get_config_str sdkconfig.ci3.*=)
-    search_cmake esp32 ${CONFIG_STR}
     search_make esp32 ${CONFIG_STR}
+    search_cmake esp32 ${CONFIG_STR}
     search_cmake esp32s2 ${CONFIG_STR}
-    search_make esp32s2 ${CONFIG_STR}
+    search_cmake esp32s3 ${CONFIG_STR}
 
     # Override EXTRA_CFLAGS and EXTRA_CXXFLAGS in the environment
     export EXTRA_CFLAGS=${PEDANTIC_CFLAGS/-Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function/}
@@ -95,6 +95,7 @@ build_stage1() {
     CONFIG_STR=$(get_config_str sdkconfig.ci2.*=)
     search_cmake esp32 ${CONFIG_STR}
     search_cmake esp32s2 ${CONFIG_STR}
+    search_cmake esp32s3 ${CONFIG_STR}
 
     build
 }