Skip to content

Commit

Permalink
Merge branch 'master' into lkgt_flag
Browse files Browse the repository at this point in the history
  • Loading branch information
cecille authored Oct 17, 2023
2 parents 877d930 + 9207eeb commit 39ece11
Show file tree
Hide file tree
Showing 1,212 changed files with 217,317 additions and 649,266 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1",
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"customizations": {
Expand Down
17 changes: 14 additions & 3 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ connstring
conntype
const
ContentApp
ContentApp's
ContentAppPlatform
ContentApp's
ContentLaunch
ContentLauncher
continuousHinting
Expand Down Expand Up @@ -477,6 +477,7 @@ edaf
edc
EDR
ee
eea
EEE
eef
ef
Expand Down Expand Up @@ -659,6 +660,8 @@ ICMP
IDF
IDL
IDLs
idt
IDT
idx
ifconfig
ifdef
Expand Down Expand Up @@ -789,6 +792,8 @@ LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
lladdr
LLADDR
LocalConfigDisabled
localedef
localhost
Expand Down Expand Up @@ -926,6 +931,7 @@ nl
NLUnitTest
NLUnitTests
nmcli
nmtui
noc
NodeId
nongnu
Expand Down Expand Up @@ -1021,11 +1027,14 @@ params
PartNumber
PASE
Passcode
passRetained
passwd
PBKDF
pbuf
pbufs
pbxproj
PCA
pcap
pcaps
PDFs
PDK
Expand All @@ -1051,6 +1060,7 @@ PlatformManager
PlatformManagerImpl
plt
png
Podman
PollControl
pollInterval
polymorphism
Expand Down Expand Up @@ -1147,8 +1157,8 @@ REPL
repo
req
Requestor
Requestor's
RequestorCanConsent
Requestor's
Requestors
responder
RestrictedEvent
Expand All @@ -1167,6 +1177,7 @@ rootfs
RPC
RPCs
RPi
RPi's
RPis
RSA
rsn
Expand Down Expand Up @@ -1202,8 +1213,8 @@ SDB
SDC
SDHC
SDK
SDK's
sdkconfig
SDK's
SDKs
SDKTARGETSYSROOT
sdl
Expand Down
13 changes: 13 additions & 0 deletions .github/actions/checkout-submodules-and-bootstrap/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ inputs:
runs:
using: "composite"
steps:
- name: Dump disk info
uses: ./.github/actions/dump-disk-info
- name: Checkout submodules
uses: ./.github/actions/checkout-submodules
with:
Expand All @@ -26,6 +28,17 @@ runs:
uses: ./.github/actions/bootstrap
with:
platform: ${{ inputs.platform }}
- name: Remove CIPD cache directory
# If there is a bootstrap-cache miss, and bootstrap installs CIPD itself,
# there is roughly 1.4GB that remains in this cache that is useless from
# this point onwards.
shell: bash
run: |
du -sh $HOME/.cipd-cache-dir/ || true
rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed"
- name: Dump disk info after checkout submodule & Bootstrap
shell: bash
run: scripts/dump_diskspace_info.sh
- name: Upload Bootstrap Logs
uses: ./.github/actions/upload-bootstrap-logs
with:
Expand Down
20 changes: 20 additions & 0 deletions .github/actions/dump-disk-info/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Dump disk space info
description: Help debug running out of disk space on github CI
runs:
using: "composite"
steps:
- name: Collect disk info
# Unfortunately current syntax for github wrapper actions only work for
# Javascript actions, and Docker container actions, which doesn't make it
# possible to wrap a shell script like the one below. The action below
# essentially wraps the shell commands we want to run into a Javascript
# wrapped action. This allow us to get the disk info usage before a job
# is run and after the job is run regardless if the job succeeds or
# fails.
uses: pyTooling/Actions/[email protected]
if: ${{ runner.os == 'Linux' }}
with:
main: |-
exec ./scripts/dump_diskspace_info.sh
post: |-
exec ./scripts/dump_diskspace_info.sh
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20

steps:
- name: Checkout
Expand Down
37 changes: 25 additions & 12 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand All @@ -303,21 +303,34 @@ jobs:

- name: Setup Build, Run Build and Run Tests
run: |
scripts/build/gn_gen.sh --args="enable_rtti=true enable_pylib=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false"
scripts/build/gn_gen.sh --args="enable_rtti=true enable_pylib=true chip_config_memory_debug_checks=false chip_config_memory_debug_dmalloc=false chip_generate_link_map_file=false"
scripts/run_in_build_env.sh "ninja -C ./out"
scripts/tests/gn_tests.sh
- name: Run Python library specific unit tests
- name: Setup test python environment
shell: bash
run: |
scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl'
scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl'
scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl'
scripts/run_in_build_env.sh '(cd src/controller/python/test/unit_tests/ && python3 -m unittest -v)'
scripts/run_in_build_env.sh 'virtualenv pyenv'
source pyenv/bin/activate
pip3 install ./out/controller/python/chip_core-0.0-cp37-abi3-linux_x86_64.whl
pip3 install ./out/controller/python/chip_clusters-0.0-py3-none-any.whl
pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl
- name: Run Python tests
shell: bash
run: |
source pyenv/bin/activate
cd src/controller/python/test/unit_tests/
python3 -m unittest -v
- name: Clean previous outputs
run: rm -rf out pyenv
- name: Run Python Setup Payload Generator Test
shell: bash
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 'virtualenv pyenv'
source pyenv/bin/activate
pip3 install -r src/setup_payload/python/requirements.txt
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)
Expand Down Expand Up @@ -401,7 +414,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:20
options: --user root

steps:
Expand All @@ -54,7 +54,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:2
image: ghcr.io/project-chip/chip-build-esp32:20
options: --user root

steps:
Expand All @@ -75,7 +75,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:1
image: ghcr.io/project-chip/chip-build-nrf-platform:20
options: --user root

steps:
Expand All @@ -96,7 +96,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-telink:16
image: ghcr.io/project-chip/chip-build-telink:20
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
# image: ghcr.io/project-chip/chip-build-cirque:0.8
# image: ghcr.io/project-chip/chip-build-cirque:20
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ghcr.io/project-chip/chip-build-doxygen:1
image: ghcr.io/project-chip/chip-build-doxygen:20

if: github.actor != 'restyled-io[bot]'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:9
image: ghcr.io/project-chip/chip-build-ameba:20
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-asr:1
image: ghcr.io/project-chip/chip-build-asr:20
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-bouffalolab:1
image: ghcr.io/project-chip/chip-build-bouffalolab:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13x2x7_26x2x7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:1
image: ghcr.io/project-chip/chip-build-ti:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc32xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:1
image: ghcr.io/project-chip/chip-build-ti:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:8
image: ghcr.io/project-chip/chip-build-efr32:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
Expand All @@ -58,9 +58,9 @@ jobs:
- name: Test SLC gen
timeout-minutes: 30
run: |
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
rm -rf ./out/
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4187C --slc_generate --docker
scripts/examples/gn_silabs_example.sh examples/lighting-app/silabs ./out/light-app BRD4164A --slc_generate --docker
rm -rf ./out/
- name: Build some BRD4187C variants (1)
run: |
./scripts/run_in_build_env.sh \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:2
image: ghcr.io/project-chip/chip-build-esp32:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:2
image: ghcr.io/project-chip/chip-build-esp32:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-infineon:1
image: ghcr.io/project-chip/chip-build-infineon:20
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
Loading

0 comments on commit 39ece11

Please sign in to comment.