Merge remote-tracking branch 'upstream/master' into granbery/preset_a…

…tomic_write_timeout

# Conflicts:
#	src/app/clusters/thermostat-server/thermostat-server.cpp
#	src/python_testing/TC_TSTAT_4_2.py

.github/workflows/docker_img.yaml

@@ -102,7 +102,6 @@ jobs:
                     # - "-imx"
                     - "-java"
                     - "-k32w"
-                    - "-mbed-os"
                     - "-nrf-platform"
                     - "-telink"
                     - "-ti"

.github/workflows/examples-ameba.yaml

@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-ameba:54
+            image: ghcr.io/project-chip/chip-build-ameba:68
             options: --user root
 
         steps:

.github/workflows/examples-bouffalolab.yaml

@@ -37,7 +37,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: ghcr.io/project-chip/chip-build-bouffalolab:54
+      image: ghcr.io/project-chip/chip-build-bouffalolab:68
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

.github/workflows/stale.yaml

@@ -0,0 +1,42 @@
+name: "Process Stale Issues and PRs"
+on:
+    workflow_dispatch:
+    schedule:
+        - cron: "30 1 * * *"
+
+permissions:
+    issues: write
+    pull-requests: write
+
+jobs:
+    stale:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/stale@v9
+              with:
+                  stale-issue-message:
+                      "This issue has been automatically marked as stale because
+                      it has not had recent activity. It will be closed if no
+                      further activity occurs. Remove stale label or comment or
+                      this will be closed in 30 days."
+                  stale-pr-message:
+                      "This pull request has been automatically marked as stale
+                      because it has not had recent activity. It will be closed
+                      if no further activity occurs. Remove stale label or
+                      comment or this will be closed in 10 days."
+                  close-issue-message:
+                      "This stale issue has been automatically closed. Thank you
+                      for your contributions."
+                  close-pr-message:
+                      "This stale pull request has been automatically closed.
+                      Thank you for your contributions."
+                  days-before-issue-stale: 30
+                  days-before-issue-close: -1 # Don't close them for now
+                  days-before-pr-stale: 90
+                  days-before-pr-close: 10
+                  exempt-issue-labels:
+                      "security,blocked,cert blocker,build issue,Spec XML
+                      align,CI/CD improvements,memory"
+                  exempt-pr-labels:
+                      "security,blocked,cert blocker,build issue,Spec XML
+                      align,CI/CD improvements,memory"

.github/workflows/tests.yaml

@@ -506,6 +506,7 @@ jobs:
               run: |
                   mkdir -p out/trace_data
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/controller/python/test/test_scripts/mobile-device-test.py'
+                  scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/execute_python_tests.py --env-file /tmp/test_env.yaml --search-directory src/python_testing'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
                   scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'

config/beken/BUILD.gn

@@ -21,10 +21,7 @@ import("//build_overrides/chip.gni")
 #import("${chip_root}/build/chip/tests.gni")
 
 group("beken") {
-  deps = [
-    "${chip_root}/examples/lighting-app/beken:MatterApp",
-    "${chip_root}/src/lib",
-  ]
+  deps = [ "${chip_root}/src/lib" ]
 }
 group("default") {
   deps = [ ":beken" ]

config/esp32/components/chip/CMakeLists.txt

@@ -467,6 +467,13 @@ if(NOT CONFIG_USE_MINIMAL_MDNS)
     endif()
 endif()
 
+if(CONFIG_OPENTHREAD_BORDER_ROUTER)
+    idf_component_get_property(rcp_update_lib espressif__esp_rcp_update COMPONENT_LIB)
+    list(APPEND chip_libraries $<TARGET_FILE:${rcp_update_lib}>)
+    idf_component_get_property(serial_flasher_lib espressif__esp-serial-flasher COMPONENT_LIB)
+    list(APPEND chip_libraries $<TARGET_FILE:${serial_flasher_lib}>)
+endif()
+
 if (CONFIG_ENABLE_ENCRYPTED_OTA)
     idf_component_get_property(esp_encrypted_img_lib espressif__esp_encrypted_img COMPONENT_LIB)
     list(APPEND chip_libraries $<TARGET_FILE:${esp_encrypted_img_lib}>)

config/esp32/components/chip/idf_component.yml

@@ -25,3 +25,8 @@ dependencies:
         rules:
             - if: "idf_version >=5.0"
             - if: "target != esp32h2"
+
+    espressif/esp_rcp_update:
+        version: "1.0.3"
+        rules:
+            - if: "idf_version >=5.0"