Fix conflicts in PR 9597

.github/workflows/android.yaml

@@ -48,7 +48,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -58,3 +58,7 @@ jobs:
  run: |
  ./scripts/run_in_build_env.sh \
  "./scripts/build/build_examples.py --no-log-timestamps --platform android build"
+ - name: Run Android build rule tests
+ run: |
+ ./scripts/run_in_build_env.sh \
+ "ninja -C out/android-arm64-chip_tool build/chip/java/tests:java_build_test.tests"

.github/workflows/bloat_check.yaml

@@ -41,3 +41,16 @@ jobs:
  scripts/helpers/bloat_check.py \
  --github-repository project-chip/connectedhomeip \
  --github-api-token "${{ secrets.GITHUB_TOKEN }}"
+
+ - name: Report2
+ run: |
+ scripts/tools/memory/gh_report.py \
+ --verbose \
+ --report-increases 1 \
+ --report-pr \
+ --github-comment \
+ --github-limit-artifact-pages 5 \
+ --github-limit-artifacts 50 \
+ --github-limit-comments 2 \
+ --github-repository project-chip/connectedhomeip \
+ --github-api-token "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/build.yaml

@@ -58,7 +58,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -129,7 +129,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -174,7 +174,7 @@ jobs:
  if: github.actor != 'restyled-io[bot]'
 
  container:
- image: connectedhomeip/chip-build:0.5.0
+ image: connectedhomeip/chip-build:latest
  volumes:
  - "/tmp/log_output:/tmp/test_logs"
  options:
@@ -257,6 +257,9 @@ jobs:
  submodules: true
  - name: Setup Environment
  run: brew install openssl pkg-config
+ - name: Try to ensure the directory for diagnostic log collection exists
+ run: |
+ mkdir -p ~/Library/Logs/DiagnosticReports || true
  - name: Fix pkgconfig link
  working-directory: /usr/local/lib/pkgconfig
  run: |
@@ -270,7 +273,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -292,6 +295,12 @@ jobs:
  scripts/build/gn_build.sh
  scripts/tests/gn_tests.sh
  done
+ - name: Uploading diagnostic logs
+ uses: actions/upload-artifact@v2
+ if: ${{ failure() }} && ${{ !env.ACT }}
+ with:
+ name: crash-log-darwin
+ path: ~/Library/Logs/DiagnosticReports/
  # TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
  # TODO https://github.com/project-chip/connectedhomeip/issues/1512
  # - name: Run Code Coverage

.github/workflows/cirque.yaml

@@ -60,6 +60,7 @@ jobs:
 
  - name: Cache
  uses: actions/cache@v2
+ if: ${{ !env.ACT }}
  id: cache
  with:
  path: ${{ env.GITHUB_CACHE_PATH }}
@@ -87,6 +88,7 @@ jobs:
  - name: Artifact suffix
  id: outsuffix
  uses: haya14busa/action-cond@v1.0.0
+ if: ${{ !env.ACT }}
  with:
  cond: ${{ github.event.pull_request.number == '' }}
  if_true: "${{ github.sha }}"
@@ -115,8 +117,8 @@ jobs:
  --volume /dev/pts:/dev/pts \
  -- scripts/tests/cirque_tests.sh run_all_tests
  - name: Uploading Binaries
- uses: actions/upload-artifact@v1
- if: ${{ always() }}
+ uses: actions/upload-artifact@v2
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name:
  cirque_log-${{steps.outsuffix.outputs.value}}-logs

.github/workflows/darwin.yaml

@@ -51,7 +51,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |

.github/workflows/examples-efr32.yaml

@@ -30,6 +30,9 @@ jobs:
  env:
  EFR32_BOARD: BRD4161A
  BUILD_TYPE: gn_efr32
+ GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
+ GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+ GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
  runs-on: ubuntu-latest
  if: github.actor != 'restyled-io[bot]'
@@ -49,42 +52,48 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
  .environment/gn_out/.ninja_log
  .environment/pigweed-venv/*.log
  - name: Build example EFR32 Lock App for BRD4161A
  timeout-minutes: 10
- run:
- scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/
- out/lock_app_debug BRD4161A
+ run: |
+ scripts/examples/gn_efr32_example.sh examples/lock-app/efr32/ out/lock_app_debug BRD4161A
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A lock-app \
+ out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
  - name: Build example EFR32 Lighting App for BRD4161A
  timeout-minutes: 10
- run:
- scripts/examples/gn_efr32_example.sh
- examples/lighting-app/efr32/ out/lighting_app_debug BRD4161A
+ run: |
+ scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug BRD4161A
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A lighting-app \
+ out/lighting_app_debug/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
  - name: Build example EFR32 Lighting App for BRD4161A with RPCs
  timeout-minutes: 10
- run:
- scripts/examples/gn_efr32_example.sh
- examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A
- -args='import("//with_pw_rpc.gni")'
+ run: |
+ scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A \
+ -args='import("//with_pw_rpc.gni")'
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
+ out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
  - name: Build example EFR32 Window Covering for BRD4161A
  timeout-minutes: 10
- run:
- scripts/examples/gn_efr32_example.sh examples/window-app/efr32/
- out/window_app_debug BRD4161A
+ run: |
+ scripts/examples/gn_efr32_example.sh examples/window-app/efr32/ out/window_app_debug BRD4161A
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A window-app \
+ out/window_app_debug/BRD4161A/chip-efr32-window-example.out /tmp/bloat_reports/
  - name: Binary artifact suffix
  id: outsuffix
  uses: haya14busa/action-cond@v1.0.0
+ if: ${{ !env.ACT }}
  with:
  cond: ${{ github.event.pull_request.number == '' }}
  if_true: "${{ github.sha }}"
  if_false: "pull-${{ github.event.pull_request.number }}"
  - name: Uploading Binaries
  uses: actions/upload-artifact@v2
+ if: ${{ !env.ACT }}
  with:
  name:
  ${{ env.BUILD_TYPE }}-example-build-${{
@@ -94,3 +103,10 @@ jobs:
  out/lock_app_debug/BRD4161A/chip-efr32-lock-example.out.map
  out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out
  out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out.map
+ - name: Uploading Size Reports
+ uses: actions/upload-artifact@v2
+ if: ${{ !env.ACT }}
+ with:
+ name: Size,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+ path: |
+ /tmp/bloat_reports/

.github/workflows/examples-esp32.yaml

@@ -26,10 +26,13 @@ jobs:
  # TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
  esp32:
  name: ESP32
- timeout-minutes: 60
+ timeout-minutes: 70
 
  env:
  BUILD_TYPE: esp32
+ GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
+ GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+ GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
  runs-on: ubuntu-latest
  if: github.actor != 'restyled-io[bot]'
@@ -50,7 +53,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -64,6 +67,10 @@ jobs:
  mkdir -p example_binaries/$BUILD_TYPE-build
  cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
  example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+ esp32 m5stack all-clusters-app \
+ example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf \
+ /tmp/bloat_reports/
  - name: Build example All Clusters App C3
  timeout-minutes: 10
  run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_c3devkit.defaults
@@ -72,65 +79,35 @@ jobs:
  mkdir -p example_binaries/$BUILD_TYPE-build
  cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
  example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+ esp32 c3devkit all-clusters-app \
+ example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf \
+ /tmp/bloat_reports/
  - name: Build example Pigweed App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/pigweed-app/esp32/build/chip-pigweed-app.elf \
- example_binaries/$BUILD_TYPE-build/chip-pigweed-app.elf
  - name: Build example Lock App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/lock-app/esp32/build/chip-lock-app.elf \
- example_binaries/$BUILD_TYPE-build/chip-lock-app.elf
  - name: Build example Bridge App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh bridge-app
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/bridge-app/esp32/build/chip-bridge-app.elf \
- example_binaries/$BUILD_TYPE-build/chip-bridge-app.elf
  - name: Build example Persistent Storage App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/persistent-storage/esp32/build/chip-persistent-storage.elf \
- example_binaries/$BUILD_TYPE-build/chip-persistent-storage.elf
  - name: Build example Shell App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh shell sdkconfig.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/shell/esp32/build/chip-shell.elf \
- example_binaries/$BUILD_TYPE-build/chip-shell.elf
  - name: Build example Temperature Measurement App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh temperature-measurement-app sdkconfig.optimize.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/temperature-measurement-app/esp32/build/chip-temperature-measurement-app.elf \
- example_binaries/$BUILD_TYPE-build/chip-temperature-measurement-app.elf
  - name: Build example IPv6 Only App
- timeout-minutes: 5
+ timeout-minutes: 10
  run: scripts/examples/esp_example.sh ipv6only-app sdkconfig.defaults
- - name: Copy aside build products
- run: |
- mkdir -p example_binaries/$BUILD_TYPE-build
- cp examples/ipv6only-app/esp32/build/chip-ipv6only-app.elf \
- example_binaries/$BUILD_TYPE-build/chip-ipv6only-app.elf
  - name: Binary artifact suffix
  id: outsuffix
  uses: haya14busa/action-cond@v1.0.0
+ if: ${{ !env.ACT }}
  with:
  cond: ${{ github.event.pull_request.number == '' }}
  if_true: "${{ github.sha }}"
@@ -139,9 +116,16 @@ jobs:
  run: |
  cp -r example_binaries/$BUILD_TYPE-build /tmp/output_binaries/
  - name: Uploading Binaries
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v2
+ if: ${{ !env.ACT }}
  with:
  name:
  ${{ env.BUILD_TYPE }}-example-build-${{
  steps.outsuffix.outputs.value }}
  path: /tmp/output_binaries/${{ env.BUILD_TYPE }}-build
+ - 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 }}
+ path: /tmp/bloat_reports/

.github/workflows/examples-infineon.yaml

@@ -28,6 +28,11 @@ jobs:
  name: Infineon examples building
  timeout-minutes: 30
 
+ env:
+ GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
+ GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+ GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+
  runs-on: ubuntu-latest
  if: github.actor != 'restyled-io[bot]'
 
@@ -44,7 +49,7 @@ jobs:
  run: scripts/build/gn_bootstrap.sh
  - name: Uploading bootstrap logs
  uses: actions/upload-artifact@v2
- if: ${{ always() }}
+ if: ${{ always() }} && ${{ !env.ACT }}
  with:
  name: bootstrap-logs
  path: |
@@ -55,4 +60,14 @@ jobs:
  run: |
  scripts/run_in_build_env.sh \
  "scripts/build/build_examples.py --no-log-timestamps --platform infineon --app lock build"
+ .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+ p6 default lock-app \
+ out/infineon-p6board-lock/chip-p6-lock-example.out
 
+ - name: Uploading Size Reports
+ uses: actions/upload-artifact@v2
+ if: ${{ !env.ACT }}
+ with:
+ name: Size,P6-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }}
+ path: |
+ out/infineon-p6board-lock/p6-default-lock-app-sizes.json