Merge remote-tracking branch 'official/master' into ci_workflow_rule

project-chip · Dec 5, 2022 · d7d5521 · d7d5521
2 parents 2e19657 + 9c0ca13
commit d7d5521
Show file tree

Hide file tree

Showing 40 changed files with 222 additions and 105 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,7 +23,11 @@ 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:
+
     build_linux_gcc_debug:
         name: Build on Linux (gcc_debug)
         timeout-minutes: 85
@@ -125,6 +129,7 @@ jobs:
             #       path: out/
             #       # objdirs are big; don't hold on to them too long.
             #       retention-days: 5
+
     build_linux:
         name: Build on Linux (fake, gcc_release, clang, simulated)
         timeout-minutes: 150
@@ -219,7 +224,6 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
-                       --no-log-timestamps \
                        --compile-database out/sanitizers/compile_commands.json \
                        --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
                        check \
@@ -228,7 +232,7 @@ jobs:
               timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --no-log-timestamps \
+                    "./scripts/build/build_examples.py \
                        --target linux-x64-minmdns-ipv6only-clang \
                        --target linux-x64-rpc-console \
                        build \
@@ -241,7 +245,7 @@ jobs:
               timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --no-log-timestamps \
+                    "./scripts/build/build_examples.py \
                        --target linux-x64-all-clusters-ipv6only-clang \
                        --target linux-x64-chip-tool-ipv6only-clang \
                        --pregen-dir ./zzz_pregenerated \
@@ -255,7 +259,7 @@ jobs:
               timeout-minutes: 15
               run: |
                   ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
+                    "./scripts/build/build_examples.py --target linux-fake-tests build"
             - name: Uploading core files
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}
@@ -295,6 +299,7 @@ jobs:
             # - name: Perform CodeQL Analysis
             #   if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
             #   uses: github/codeql-action/analyze@v1
+
     build_linux_python_lib:
         name: Build on Linux (python_lib)
         timeout-minutes: 60
@@ -430,7 +435,6 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
-                       --no-log-timestamps \
                        --compile-database out/default/compile_commands.json \
                        check \
                     "

diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -25,6 +25,9 @@ concurrency:
         'workflow_dispatch' && github.run_number) || github.sha }}
     cancel-in-progress: true
 
+env:
+    CHIP_NO_LOG_TIMESTAMPS: true
+
 jobs:
     test_suites_chip_tool_darwin:
         name: Test Suites - Darwin

diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -22,6 +22,9 @@ 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:
     ameba:
         name: Ameba

diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
@@ -23,6 +23,9 @@ 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:
   bouffalolab:
     name: Bouffalo Lab

diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -22,6 +22,9 @@ 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:
     cc26x2x7:
         name: cc26x2x7

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -22,6 +22,9 @@ 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:
   efr32:
     name: EFR32

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -22,6 +22,9 @@ 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:
     esp32:
         name: ESP32

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -23,6 +23,9 @@ 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:
     infineon:
         name: Infineon examples building
@@ -69,7 +72,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh \
                     "scripts/build/build_examples.py \
-                        --enable-flashbundle --no-log-timestamps \
+                        --enable-flashbundle \
                         --target infineon-psoc6-lock \
                         build \
                         --copy-artifacts-to out/artifacts \
@@ -83,7 +86,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh \
                     "scripts/build/build_examples.py \
-                        --enable-flashbundle --no-log-timestamps \
+                        --enable-flashbundle \
                         --target infineon-psoc6-all-clusters \
                         build \
                         --copy-artifacts-to out/artifacts \
@@ -97,7 +100,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh \
                     "scripts/build/build_examples.py \
-                        --enable-flashbundle --no-log-timestamps \
+                        --enable-flashbundle \
                         --target infineon-psoc6-all-clusters-minimal \
                         build \
                         --copy-artifacts-to out/artifacts \
@@ -111,7 +114,7 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh \
                     "scripts/build/build_examples.py \
-                        --enable-flashbundle --no-log-timestamps \
+                        --enable-flashbundle \
                         --target infineon-psoc6-light \
                         build \
                         --copy-artifacts-to out/artifacts \

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -22,6 +22,9 @@ 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:
     k32w:
         name: K32W

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -22,6 +22,9 @@ 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:
     arm_crosscompile:
         name: Linux ARM Cross compile
@@ -64,11 +67,13 @@ jobs:
                   path: |
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
+
             - name: Build Some samples
               timeout-minutes: 45
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
+                        --target linux-arm64-chip-cert \
                         --target linux-arm64-all-clusters-clang \
                         --target linux-arm64-chip-tool-ipv6only-clang \
                         --target linux-arm64-lock-clang \

diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
@@ -22,6 +22,9 @@ 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:
     imx:
         name: Linux i.MX Build
@@ -45,53 +48,60 @@ jobs:
             - name: Checkout submodules
               run: scripts/checkout_submodules.py --shallow --platform linux
 
-            - name: Build App
+            - name: Bootstrap
+              run: scripts/build/gn_bootstrap.sh
+
+            - name: Build lighting-app
               timeout-minutes: 30
               run: |
-                  ./scripts/examples/imxlinux_example.sh \
-                  examples/lighting-app/linux/ examples/lighting-app/linux/out/aarch64
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target imx-lighting-app \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out
             - name: Build chip-tool
               timeout-minutes: 30
               run: |
-                  ./scripts/examples/imxlinux_example.sh \
-                  examples/chip-tool examples/chip-tool/out/aarch64
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target imx-chip-tool \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out
             - name: Build thermostat
               timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                        --target imx-thermostat build \
-                     "
+                        --target imx-thermostat \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out
             - name: Build all-cluster
               timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                         --target imx-all-clusters-app build \
-                     "
+                        --target imx-all-clusters-app \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out
             - name: Build all-cluster-minimal
               timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                         --target imx-all-clusters-minimal-app build \
-                     "
+                        --target imx-all-clusters-minimal-app \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out
             - name: Build ota-provider-app
               timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                         --target imx-ota-provider-app build
-                     "
+                        --target imx-ota-provider-app \
+                        build"
             - name: Clean out build output
               run: rm -rf ./out