Merge branch 'master' into emargolis/feature/fix-scripts-all-clusters…

…-app-zap-events

.github/workflows/build.yaml

@@ -17,6 +17,7 @@ name: Builds
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:
@@ -27,7 +28,6 @@ env:
     CHIP_NO_LOG_TIMESTAMPS: true
 
 jobs:
-
     build_linux_gcc_debug:
         name: Build on Linux (gcc_debug)
         timeout-minutes: 85
@@ -221,18 +221,18 @@ jobs:
               env:
                   LSAN_OPTIONS: detect_leaks=1
               run: |
-                    for BUILD_TYPE in asan tsan ubsan; do
-                        case $BUILD_TYPE in
-                            "asan") GN_ARGS='is_clang=true is_asan=true';;
-                            "msan") GN_ARGS='is_clang=true is_msan=true';;
-                            "tsan") GN_ARGS='is_clang=true is_tsan=true chip_enable_wifi=false';;
-                            "ubsan") GN_ARGS='is_clang=true is_ubsan=true';;
-                        esac
-
-                        rm -rf ./out/sanitizers
-                        BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
-                        BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
-                    done
+                  for BUILD_TYPE in asan tsan ubsan; do
+                      case $BUILD_TYPE in
+                          "asan") GN_ARGS='is_clang=true is_asan=true';;
+                          "msan") GN_ARGS='is_clang=true is_msan=true';;
+                          "tsan") GN_ARGS='is_clang=true is_tsan=true chip_enable_wifi=false';;
+                          "ubsan") GN_ARGS='is_clang=true is_ubsan=true';;
+                      esac
+
+                      rm -rf ./out/sanitizers
+                      BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS" --export-compile-commands
+                      BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
+                  done
             - name: Ensure codegen is done for sanitize
               timeout-minutes: 45
               run: |
@@ -370,9 +370,9 @@ jobs:
             - name: Run Python Setup Payload Generator Test
               timeout-minutes: 10
               run: |
-                scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
-                scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
-                scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
+                  scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
+                  scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
+                  scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
 
     build_darwin:
         name: Build on Darwin (clang, python_lib, simulated)

.github/workflows/chef.yaml

@@ -17,6 +17,7 @@ name: Build Chef CI examples on all platforms
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -126,4 +127,4 @@ jobs:
             - name: CI Examples NRFConnect
               shell: bash
               run: |
-                ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t nrfconnect"
+                  ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t nrfconnect"

.github/workflows/cirque.yaml

@@ -17,6 +17,7 @@ name: Cirque
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/darwin-tests.yaml

@@ -17,6 +17,7 @@ name: Darwin Tests
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/darwin.yaml

@@ -17,6 +17,7 @@ name: Darwin
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/examples-ameba.yaml

@@ -17,6 +17,7 @@ name: Build example - Ameba
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-bouffalolab.yaml

@@ -17,6 +17,7 @@ name: Build example - BouffaloLab
 on:
   push:
   pull_request:
+  merge_group:
   workflow_dispatch:
 
 concurrency:
@@ -59,10 +60,10 @@ jobs:
       - name: Bootstrap cache
         uses: actions/cache@v3
         with:
-            key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
-            path: |
-                .environment
-                build_overrides/pigweed_environment.gni
+          key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
+          path: |
+            .environment
+            build_overrides/pigweed_environment.gni
       - name: Bootstrap
         timeout-minutes: 25
         run: scripts/build/gn_bootstrap.sh

.github/workflows/examples-cc13x2x7_26x2x7.yaml

@@ -17,6 +17,7 @@ name: Build example - TI CC26X2X7
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-cc32xx.yaml

@@ -17,6 +17,7 @@ name: Build example - TI CC32XX
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-efr32.yaml

@@ -17,6 +17,7 @@ name: Build example - EFR32
 on:
   push:
   pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -65,10 +66,10 @@ jobs:
       - name: Bootstrap cache
         uses: actions/cache@v3
         with:
-            key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
-            path: |
-                .environment
-                build_overrides/pigweed_environment.gni
+          key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
+          path: |
+            .environment
+            build_overrides/pigweed_environment.gni
       - name: Bootstrap
         timeout-minutes: 25
         run: scripts/build/gn_bootstrap.sh

.github/workflows/examples-esp32.yaml

@@ -17,6 +17,7 @@ name: Build example - ESP32
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-infineon.yaml

@@ -17,6 +17,7 @@ name: Build example - Infineon
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/examples-k32w.yaml

@@ -17,6 +17,7 @@ name: Build example - K32W with SE051
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-linux-arm.yaml

@@ -17,6 +17,7 @@ name: Build example - Linux ARM
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-linux-imx.yaml

@@ -17,6 +17,7 @@ name: Build example - i.MX Linux
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-linux-standalone.yaml

@@ -17,6 +17,7 @@ name: Build example - Linux Standalone
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-mbed.yaml

@@ -17,6 +17,7 @@ name: Build example - Mbed OS
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/examples-mw320.yaml

@@ -17,6 +17,7 @@ name: Build example - MW320
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-nrfconnect.yaml

@@ -17,6 +17,7 @@ name: Build example - nRF Connect SDK
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-openiotsdk.yaml

@@ -17,6 +17,7 @@ name: Build example - Open IoT SDK
 on:
     push:
     pull_request:
+    merge_group:
     workflow_dispatch:
 
 concurrency:

.github/workflows/examples-qpg.yaml

@@ -17,6 +17,7 @@ name: Build example - QPG
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-telink.yaml

@@ -17,6 +17,7 @@ name: Build example - Telink
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}

.github/workflows/examples-tizen.yaml

@@ -17,6 +17,7 @@ name: Build example - Tizen
 on:
     push:
     pull_request:
+    merge_group:
 
 concurrency:
     group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
@@ -63,14 +64,14 @@ jobs:
 
             - name: Build Tizen examples
               run: |
-                ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py \
-                        --enable-flashbundle \
-                        --target tizen-arm-all-clusters \
-                        --target tizen-arm-all-clusters-minimal-no-wifi \
-                        --target tizen-arm-chip-tool-ubsan \
-                        --target tizen-arm-light \
-                        --target tizen-arm-light-no-ble-no-wifi \
-                        build \
-                        --copy-artifacts-to out/artifacts \
-                    "
+                  ./scripts/run_in_build_env.sh \
+                      "./scripts/build/build_examples.py \
+                          --enable-flashbundle \
+                          --target tizen-arm-all-clusters \
+                          --target tizen-arm-all-clusters-minimal-no-wifi \
+                          --target tizen-arm-chip-tool-ubsan \
+                          --target tizen-arm-light \
+                          --target tizen-arm-light-no-ble-no-wifi \
+                          build \
+                          --copy-artifacts-to out/artifacts \
+                      "