[Bouffalolab] Cherry-pick: fix *.flash.py download issue and application code refactor

.github/workflows/examples-bouffalolab.yaml

@@ -12,30 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Build example - Bouffalolab BL702
+name: Build example - BouffaloLab
 
 on:
   push:
   pull_request:
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
   cancel-in-progress: true
 
+env:
+  CHIP_NO_LOG_TIMESTAMPS: true
+
 jobs:
-  bl702:
-    name: BL702
+  bouffalolab:
+    name: Bouffalo Lab
     timeout-minutes: 90
 
     runs-on: ubuntu-latest
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-bouffalolab:0.6.12
+      image: connectedhomeip/chip-build-bouffalolab:0.6.17
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:
-      - uses: Wandalen/[email protected].15
+      - uses: Wandalen/[email protected].36
         name: Checkout
         with:
           action: actions/checkout@v3
@@ -51,27 +55,68 @@ jobs:
         env:
           GH_CONTEXT: ${{ toJson(github) }}
         run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
-
-      - name: Build example BL702 Lighting App
+
+      - name: Bootstrap
+        timeout-minutes: 25
+        run: scripts/build/gn_bootstrap.sh
+      - name: Uploading bootstrap logs
+        uses: actions/upload-artifact@v3
+        if: ${{ always() && !env.ACT }}
+        with:
+          name: bootstrap-logs
+          path: |
+            .environment/gn_out/.ninja_log
+            .environment/pigweed-venv/*.log
+      - name: Build example BL602 Lighting App
         timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py --target bouffalolab-BL706-IoT-DVK-light build"
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py bl702 bl702 lighting-app \
-            out/bouffalolab-BL706-IoT-DVK-light/chip-bl702-lighting-example.out /tmp/bloat_reports/
+            "./scripts/build/build_examples.py \
+              --target bouffalolab-bl602-iot-matter-v1-light \
+              --target bouffalolab-bl602-iot-matter-v1-light-rpc \
+              build \
+              --copy-artifacts-to out/artifacts \
+            "
+      - name: Prepare some bloat report from the previous builds
+        run: |
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl602 bl602 lighting-app \
+              out/artifacts/bouffalolab-bl602-iot-matter-v1-light/chip-bl602-lighting-example.out \
+              /tmp/bloat_reports/
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl602 bl602+rpc lighting-app \
+              out/artifacts/bouffalolab-bl602-iot-matter-v1-light-rpc/chip-bl602-lighting-example.out \
+              /tmp/bloat_reports/
+      - name: Clean out build output
+        run: rm -rf ./out
 
-      - name: Build example BL702 Lighting App with RPCs
+      - name: Build example BL702 Lighting App
         timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py --target bouffalolab-BL706-IoT-DVK-light-rpc build"
-          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py bl702 bl702+rpc lighting-app \
-            out/bouffalolab-BL706-IoT-DVK-light-rpc/chip-bl702-lighting-example.out /tmp/bloat_reports/
+            "./scripts/build/build_examples.py \
+              --target bouffalolab-xt-zb6-devkit-light \
+              --target bouffalolab-xt-zb6-devkit-light-rpc \
+              build \
+              --copy-artifacts-to out/artifacts \
+            "
+      - name: Prepare some bloat report from the previous builds
+        run: |
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl702 bl702 lighting-app \
+              out/artifacts/bouffalolab-xt-zb6-devkit-light/chip-bl702-lighting-example.out \
+              /tmp/bloat_reports/
+          .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+              bl702 bl702+rpc lighting-app \
+              out/artifacts/bouffalolab-xt-zb6-devkit-light-rpc/chip-bl702-lighting-example.out \
+              /tmp/bloat_reports/
+      - name: Clean out build output
+        run: rm -rf ./out
 
       - name: Uploading Size Reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ !env.ACT }}
         with:
-          name: Size,BL702-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
+          name: Size,BouffaloLab-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
           path: |
             /tmp/bloat_reports/

.gitmodules

@@ -62,7 +62,7 @@
 	path = third_party/freertos/repo
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 	branch  = V10.3.1-kernel-only
-	platforms = ameba,cc13x2_26x2,bl602,efr32,esp32,k32w0,infineon,qpg
+	platforms = ameba,cc13x2_26x2,bouffalolab,efr32,esp32,k32w0,infineon,qpg
 [submodule "simw-top-mini"]
 	path = third_party/simw-top-mini/repo
 	url = https://github.com/NXP/plug-and-trust.git
@@ -287,5 +287,5 @@
         path = third_party/bouffalolab/repo
         url = https://github.com/bouffalolab/bl_iot_sdk_tiny.git
         branch = master
-        platforms = bouffalolab,bl602
+        platforms = bouffalolab
 

.vscode/tasks.json

@@ -331,12 +331,12 @@
                 "android-arm64-chip-tvserver",
                 "android-x64-chip-tool",
                 "android-x86-chip-tool",
-                "bl602-light",
-                "bouffalolab-BL702-IoT-DVK-light",
-                "bouffalolab-BL702-IoT-DVK-light-rpc",
-                "bouffalolab-BL706-IoT-DVK-BL706C-22-light",
-                "bouffalolab-BL706-IoT-DVK-BL706C-22-light-rpc",
-                "bouffalolab-BL706-NIGHT-LIGHT",
+                "bouffalolab-bl602-iot-matter-v1-light",
+                "bouffalolab-bl602-iot-matter-v1-light-rpc-115200",
+                "bouffalolab-bl602-night-light-light",
+                "bouffalolab-xt-zb6-devkit-light",
+                "bouffalolab-xt-zb6-devkit-light-rpc-115200",
+                "bouffalolab-bl706-night-light-light",
                 "efr32-brd4161a-light",
                 "efr32-brd4163a-light",
                 "efr32-brd4164a-light",

README.md

@@ -11,6 +11,7 @@
 [![Examples - QPG](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20QPG/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-qpg.yaml)
 [![Examples - TI CC26X2X7](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20TI%20CC26X2X7/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-cc13x2x7_26x2x7.yaml)
 [![Build example - Infineon](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-infineon.yaml/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-infineon.yaml)
+[![Build example - BouffaloLab](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20BouffaloLab/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-bouffalolab.yaml)
 
 [![Android](https://github.com/project-chip/connectedhomeip/workflows/Android/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/android.yaml)