Merge remote-tracking branch 'origin/master' into binding-storage

project-chip · Mar 3, 2022 · 44b2cc7 · 44b2cc7
2 parents 3c621a9 + 66aef3e
commit 44b2cc7
Show file tree

Hide file tree

Showing 219 changed files with 97,337 additions and 5,942 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -117,6 +117,7 @@ BDX
 BDXDownloader
 BeagleBone
 befc
+betaprogram
 BinaryInputBasic
 bitbake
 bld
@@ -279,6 +280,7 @@ CQM
 crypto
 cryptographic
 CSA
+csrrequest
 csu
 csv
 ctl
@@ -809,6 +811,7 @@ NitrogenDioxideConcentrationMeasurement
 nl
 NLUnitTest
 NLUnitTests
+noc
 NodeId
 nongnu
 nordicsemi
@@ -855,6 +858,7 @@ optionsOverride
 orgs
 OTA
 OTADownloader
+otaDownloadPath
 otaImageList
 OTAImageProcessorDriver
 OTAImageProcessorInterface
@@ -904,6 +908,7 @@ pickString
 PID
 Pigweed
 PinCode
+pinrequest
 pkgconfig
 plaintext
 PlatformManager
@@ -1057,6 +1062,7 @@ SetDns
 SetImageProcessorDelegate
 SetOtaRequestorDriver
 setpin
+setpoint
 SetpointRaiseLower
 SetRequestorInstance
 SetUpPINCode
@@ -1171,6 +1177,7 @@ ThermostatUserInterfaceConfiguration
 ThIsIsNoTMyReAlGiThUbToKeNSoDoNoTtRy
 ThreadNetworkDiagnostics
 threadOperationalDataset
+threadnetworkdiagnostics
 ThreadStackManager
 ThreadStackManagerImpl
 ths
@@ -1211,6 +1218,7 @@ TurbidityConcentrationMeasurement
 TXD
 txt
 UART
+uargument
 udc
 udcport
 udhcpc
@@ -1234,7 +1242,9 @@ updateAvailable
 updateNotAvailable
 UpdateTokens
 upstreamed
+ureverse
 URI
+urlrequest
 usbmodem
 USBtoUART
 uscif

diff --git a/.github/workflows/full-esp32.yaml → .github/workflows/examples-esp32.yaml b/.github/workflows/full-esp32.yaml → .github/workflows/examples-esp32.yaml
@@ -12,20 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Full builds - ESP32
+name: Build example - ESP32
 
 on:
     push:
-    workflow_dispatch:
+    pull_request:
 
 concurrency:
-    group: full-${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
+    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
 
 jobs:
+    # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
     esp32:
-        name: Run
-        timeout-minutes: 200 
+        name: ESP32
+        timeout-minutes: 80
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -96,6 +97,44 @@ jobs:
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
 
+            - name: Uploading Size Reports
+              uses: actions/upload-artifact@v2
+              if: ${{ !env.ACT }}
+              with:
+                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
+                  path: /tmp/bloat_reports/
+
+    esp32_1:
+        name: ESP32_1
+        timeout-minutes: 70
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: connectedhomeip/chip-build-esp32:0.5.56
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+              with:
+                  submodules: true
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
+
+            - name: Uploading bootstrap logs
+              uses: actions/upload-artifact@v2
+              if: ${{ always() }} && ${{ !env.ACT }}
+              with:
+                  name: bootstrap-logs
+                  path: |
+                   .environment/gn_out/.ninja_log
+                   .environment/pigweed-venv/*.log
+
             - name: Build example Bridge App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh bridge-app
@@ -123,11 +162,3 @@ jobs:
             - name: Build example OTA Provider App
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
               timeout-minutes: 10
-
-            - name: Uploading Size Reports
-              uses: actions/upload-artifact@v2
-              if: ${{ !env.ACT }}
-              with:
-                  name: Size,ESP32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
-                  path: /tmp/bloat_reports/
-
diff --git a/.github/workflows/smoketest-esp32.yaml b/.github/workflows/smoketest-esp32.yaml
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -68,7 +68,7 @@ chip_gn_arg_append("esp32_cxx"             "\"${CMAKE_CXX_COMPILER}\"")
 chip_gn_arg_append("esp32_cpu"             "\"esp32\"")
 chip_gn_arg_bool("is_debug"                ${is_debug})
 
-if(CONFIG_BT_ENABLED)
+if(CONFIG_ENABLE_CHIPOBLE)
 chip_gn_arg_append("chip_config_network_layer_ble"           "true")
 else()
 chip_gn_arg_append("chip_config_network_layer_ble"           "false")