ESP32: Optimize the time taken by esp32 workflows (#8409)

project-chip · Sep 14, 2021 · bf18b73 · bf18b73
1 parent a9467fb
commit bf18b73
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 146 deletions.
diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -61,53 +61,69 @@ jobs:
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
             - name: Build example All Clusters App
-              timeout-minutes: 25
-              run: scripts/examples/esp_example.sh all-clusters-app
+              timeout-minutes: 10
+              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_m5stack.defaults
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
+            - name: Build example All Clusters App C3
+              timeout-minutes: 10
+              run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_c3devkit.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
             - name: Build example Pigweed App
               timeout-minutes: 5
-              run: scripts/examples/esp_example.sh pigweed-app
+              run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/pigweed-app/esp32/build/chip-pigweed-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-pigweed-app.elf
             - name: Build example Lock App
               timeout-minutes: 5
-              run: scripts/examples/esp_example.sh lock-app
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/lock-app/esp32/build/chip-lock-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-lock-app.elf
             - name: Build example Persistent Storage App
               timeout-minutes: 5
-              run: scripts/examples/esp_example.sh persistent-storage
+              run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/persistent-storage/esp32/build/chip-persistent-storage.elf \
                      example_binaries/$BUILD_TYPE-build/chip-persistent-storage.elf
             - name: Build example Shell App
               timeout-minutes: 5
-              run: scripts/examples/esp_example.sh shell
+              run: scripts/examples/esp_example.sh shell sdkconfig.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/shell/esp32/build/chip-shell.elf \
                      example_binaries/$BUILD_TYPE-build/chip-shell.elf
             - name: Build example Temperature Measurement App
-              timeout-minutes: 25
-              run: scripts/examples/esp_example.sh temperature-measurement-app
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh temperature-measurement-app sdkconfig.optimize.defaults
             - name: Copy aside build products
               run: |
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/temperature-measurement-app/esp32/build/chip-temperature-measurement-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-temperature-measurement-app.elf
+            - name: Build example IPv6 Only App
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh ipv6only-app sdkconfig.defaults
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/ipv6only-app/esp32/build/chip-ipv6only-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-ipv6only-app.elf
             - name: Binary artifact suffix
               id: outsuffix
               uses: haya14busa/[email protected]

diff --git a/examples/all-clusters-app/esp32/sdkconfig_devkit.defaults b/examples/all-clusters-app/esp32/sdkconfig_devkit.defaults
diff --git a/examples/temperature-measurement-app/esp32/sdkconfig_devkit.defaults b/examples/temperature-measurement-app/esp32/sdkconfig_devkit.defaults
diff --git a/scripts/build/builders/esp32.py b/scripts/build/builders/esp32.py
@@ -41,7 +41,7 @@ def DefaultsFileName(board: Esp32Board, app: Esp32App):
     return None
 
   if board == Esp32Board.DevKitC:
-    return 'sdkconfig_devkit.defaults'
+    return 'sdkconfig.defaults'
   elif board == Esp32Board.M5Stack:
     return 'sdkconfig_m5stack.defaults'
   else:

diff --git a/scripts/examples/esp_example.sh b/scripts/examples/esp_example.sh
@@ -20,6 +20,7 @@ set -x
 env
 
 app="$1"
+sdkconfig_name="$2"
 root=examples/$app/esp32/
 
 shift 1
@@ -33,23 +34,19 @@ source "scripts/activate.sh"
 # shellcheck source=/dev/null
 source "$IDF_PATH/export.sh"
 
-for sdkconfig in "$root"/sdkconfig*.defaults; do
-    # remove root path to get sdkconfig*.defaults name
-    sdkconfig_name=${sdkconfig#"$root"/}
-    if [ "$sdkconfig_name" == "sdkconfig_c3devkit.defaults" ]; then
-        idf_target="esp32c3"
-    else
-        idf_target="esp32"
-    fi
-
-    rm -f "$root"/sdkconfig
-    (
-        cd "$root"
-        idf.py set-target "$idf_target"
-        idf.py -D SDKCONFIG_DEFAULTS="$sdkconfig_name" build
-    ) || {
-        echo "build $sdkconfig_name failed"
-        exit 1
-    }
-    cp "$root"/build/chip-"$app".elf "$root"/build/"${sdkconfig_name%".defaults"}"-chip-"$app".elf
-done
+if [ "$sdkconfig_name" == "sdkconfig_c3devkit.defaults" ]; then
+    idf_target="esp32c3"
+else
+    idf_target="esp32"
+fi
+
+rm -f "$root"/sdkconfig
+(
+    cd "$root"
+    idf.py set-target "$idf_target"
+    idf.py -D SDKCONFIG_DEFAULTS="$sdkconfig_name" build
+) || {
+    echo "build $sdkconfig_name failed"
+    exit 1
+}
+cp "$root"/build/chip-"$app".elf "$root"/build/"${sdkconfig_name%".defaults"}"-chip-"$app".elf