Skip to content

Commit 5d40535

Browse files
mkardous-silabsmkardous-silabs
authored
Merge of CSA master into main (#213)
2 parents af8b157 + 19ae943 commit 5d40535

File tree

1,548 files changed

+127071
-32177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,548 files changed

+127071
-32177
lines changed

‎.devcontainer/Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ RUN apt-get update \
4040
icecc \
4141
&& :
4242

43-
RUN groupadd -g $USER_GID $USERNAME \
43+
RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \
44+
&& (getent group $USER_GID && groupdel -f $(getent group $USER_GID | cut -d: -f1) || true) \
45+
&& (getent passwd $USERNAME && userdel -f $USERNAME || true) \
46+
&& (getent group $USERNAME && groupdel -f $USERNAME || true) \
47+
&& groupadd -g $USER_GID $USERNAME \
4448
&& useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
4549
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
4650
&& chmod 0440 /etc/sudoers.d/$USERNAME \

‎.github/.wordlist.txt

+12
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ AFL
4141
AIDL
4242
algs
4343
alloc
44+
allocator
45+
allocators
46+
Ambrose
4447
Ameba
4548
amebad
4649
amebaiot
@@ -317,6 +320,7 @@ cryptographic
317320
CSA
318321
csg
319322
csrrequest
323+
cstdint
320324
csu
321325
csv
322326
ctl
@@ -440,6 +444,7 @@ DNSStubListener
440444
docbuild
441445
Dockerfile
442446
Dockerfiles
447+
docstrings
443448
Don'ts
444449
DoorLock
445450
DoorState
@@ -565,6 +570,8 @@ FlowMeasurement
565570
FluorideConcentrationMeasurement
566571
focusable
567572
forkpty
573+
formatter
574+
formatters
568575
FOTA
569576
FreeRTOS
570577
FreeRTOSConfig
@@ -731,6 +738,7 @@ IPython
731738
ISCAN
732739
isHexString
733740
isLowerCase
741+
isort
734742
isUpperCase
735743
itemName
736744
iterable
@@ -878,6 +886,7 @@ MediaPlayback
878886
MediaTek
879887
MEI
880888
mem
889+
memcpy
881890
memdf
882891
MemMonitoring
883892
menuconfig
@@ -933,6 +942,7 @@ mv
933942
MX
934943
mydir
935944
MyPASSWORD
945+
mypy
936946
MySSID
937947
NAMESERVER
938948
NAMESPACE
@@ -1185,6 +1195,7 @@ rebase
11851195
recommand
11861196
recommanded
11871197
recurse
1198+
refrigeratoralarm
11881199
regen
11891200
registerAttributeAccessOverride
11901201
RegisterCommandHandler
@@ -1442,6 +1453,7 @@ toJson
14421453
tokenization
14431454
tokenized
14441455
tokenizer
1456+
toml
14451457
toolchain
14461458
toolchains
14471459
topologies

‎.github/PULL_REQUEST_TEMPLATE.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
> !!!!!!!!!! Please delete the instructions below and replace with PR description
1+
> !!!!!!!!!! Please delete the instructions below and replace with PR
2+
> description
23
>
3-
> If you have an issue number, please use a syntax of
4-
> `Fixes #12345` and a brief change description
4+
> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
5+
> change description
56
>
6-
> If you do not have an issue number, please have a good description of
7-
> the problem and the fix. Help the reviewer understand what to expect.
7+
> If you do not have an issue number, please have a good description of the
8+
> problem and the fix. Help the reviewer understand what to expect.
9+
>
10+
> Complete/append to the `### Testing` section below, to describe how testing
11+
> was done. See
12+
> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
813
>
914
> Make sure you delete these instructions (to prove you have read them).
1015
>
1116
> !!!!!!!!!! Instructions end
1217
18+
#### Testing

‎.github/labeler.yml

-9
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,6 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122-
# Cert tests touched: add current milestone delta-tracking label.
123-
# TODO: Change after Aug 15, 2024
124-
matter-1.4-te2-script-change:
125-
- changed-files:
126-
- any-glob-to-any-file:
127-
- src/python_testing/*
128-
- src/python_testing/**/*
129-
- src/app/tests/suites/certification/*
130-
131122
############################################################
132123
# Source Code
133124
############################################################

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:90
37+
image: ghcr.io/project-chip/chip-build:97
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: github.actor != 'restyled-io[bot]'
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build:90
46+
image: ghcr.io/project-chip/chip-build:97
4747
volumes:
4848
- "/:/runner-root-volume"
4949
- "/tmp/log_output:/tmp/test_logs"
@@ -139,7 +139,7 @@ jobs:
139139
if: github.actor != 'restyled-io[bot]'
140140

141141
container:
142-
image: ghcr.io/project-chip/chip-build:90
142+
image: ghcr.io/project-chip/chip-build:97
143143
volumes:
144144
- "/:/runner-root-volume"
145145
- "/tmp/log_output:/tmp/test_logs"
@@ -308,7 +308,7 @@ jobs:
308308
if: github.actor != 'restyled-io[bot]'
309309

310310
container:
311-
image: ghcr.io/project-chip/chip-build:90
311+
image: ghcr.io/project-chip/chip-build:97
312312
volumes:
313313
- "/:/runner-root-volume"
314314
- "/tmp/log_output:/tmp/test_logs"
@@ -371,7 +371,7 @@ jobs:
371371
if: github.actor != 'restyled-io[bot]'
372372

373373
container:
374-
image: ghcr.io/project-chip/chip-build:90
374+
image: ghcr.io/project-chip/chip-build:97
375375
volumes:
376376
- "/:/runner-root-volume"
377377
- "/tmp/log_output:/tmp/test_logs"
@@ -490,7 +490,7 @@ jobs:
490490
if: github.actor != 'restyled-io[bot]'
491491

492492
container:
493-
image: ghcr.io/project-chip/chip-build:90
493+
image: ghcr.io/project-chip/chip-build:97
494494
volumes:
495495
- "/:/runner-root-volume"
496496
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/cancel_workflows_for_pr.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ jobs:
3535
python-version: '3.12'
3636
- name: Setup pip modules we use
3737
run: |
38-
pip install \
38+
python3 -m venv venv
39+
venv/bin/pip3 install \
3940
click \
4041
coloredlogs \
4142
python-dateutil \
4243
pygithub \
43-
&& echo "DONE installint python prerequisites"
44+
&& echo "DONE installing python prerequisites"
4445
- name: Cancel runs
4546
run: |
46-
scripts/tools/cancel_workflows_for_pr.py \
47+
venv/bin/python3 scripts/tools/cancel_workflows_for_pr.py \
4748
--gh-api-token "${{ secrets.GITHUB_TOKEN }}" \
4849
--require "Restyled" \
4950
--require "Lint Code Base" \

‎.github/workflows/check-data-model-directory-updates.yaml

+18-10
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,28 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
name: Check for changes to data_model directory without a sha update
15+
name: Data model directory checks
1616

1717
on:
1818
pull_request:
19-
paths:
20-
- "data_model/**"
2119

2220
jobs:
23-
check-submodule-update-label:
24-
name: Check for changes to data_model directory without a sha update
21+
check-data_model-updates:
22+
name: Check for updates to data model directory without SHA updates
2523
runs-on: ubuntu-latest
26-
if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
24+
container:
25+
image: ghcr.io/project-chip/chip-build
2726
steps:
28-
- name: Error Message
29-
run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
30-
- name: Fail Job
31-
run: exit 1
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 2
31+
- name: Check for changes to master data_model directory without a SHA update
32+
run: |
33+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/master
34+
- name: Check for changes to 1.3 data_model directory without a SHA update
35+
run: |
36+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.3
37+
- name: Check for changes to 1.4 data_model directory without a SHA update
38+
run: |
39+
python3 scripts/dm_xml_ci_change_enforcement.py data_model/1.4

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:90
39+
image: ghcr.io/project-chip/chip-build:97
4040
options: --user root
4141

4242
steps:
@@ -57,7 +57,7 @@ jobs:
5757
if: github.actor != 'restyled-io[bot]'
5858

5959
container:
60-
image: ghcr.io/project-chip/chip-build-esp32:90
60+
image: ghcr.io/project-chip/chip-build-esp32:97
6161
options: --user root
6262

6363
steps:
@@ -78,7 +78,7 @@ jobs:
7878
if: github.actor != 'restyled-io[bot]'
7979

8080
container:
81-
image: ghcr.io/project-chip/chip-build-nrf-platform:90
81+
image: ghcr.io/project-chip/chip-build-nrf-platform:97
8282
options: --user root
8383

8484
steps:
@@ -99,7 +99,7 @@ jobs:
9999
if: github.actor != 'restyled-io[bot]'
100100

101101
container:
102-
image: ghcr.io/project-chip/chip-build-telink:90
102+
image: ghcr.io/project-chip/chip-build-telink:97
103103
options: --user root
104104

105105
steps:
@@ -111,7 +111,7 @@ jobs:
111111
platform: telink
112112
# - name: Update Zephyr to specific revision (for developers purpose)
113113
# shell: bash
114-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py f762f1a1027284e63e338e6d83deeade62f355b0"
114+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py c05c461b1119782cc839cf436fa04ec5e1fb2c8c"
115115
- name: CI Examples Telink
116116
shell: bash
117117
run: |

‎.github/workflows/docbuild.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,18 @@ jobs:
2929
- name: Install Python
3030
uses: actions/setup-python@v5
3131
with:
32-
python-version: 3.8
32+
python-version: 3.12
3333
cache-dependency-path: matter/docs/requirements.txt
3434
cache: pip
3535
- name: Install base dependencies
3636
working-directory: matter
3737
run: |
38-
sudo pip3 install -U pip
39-
pip3 install -r docs/requirements.txt
38+
python3 -m venv venv
39+
venv/bin/pip3 install -r docs/requirements.txt
4040
- name: Build documentation
4141
working-directory: matter/docs
4242
run: |
43+
source ../venv/bin/activate
4344
mkdir -p _build/src
4445
make html
4546
touch _build/html/.nojekyll

‎.github/workflows/docker_img.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ on:
3333
required: false
3434
type: boolean
3535
default: false
36-
36+
3737
jobs:
3838
build_images_base:
3939
name: Build Docker CHIP Build images - base
@@ -102,6 +102,7 @@ jobs:
102102
# - "-imx"
103103
- "-java"
104104
- "-nxp"
105+
- "-nxp-zephyr"
105106
- "-nrf-platform"
106107
- "-telink"
107108
- "-ti"
@@ -120,7 +121,7 @@ jobs:
120121
run: |
121122
cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
122123
./build.sh --latest
123-
124+
124125
build_images_stage_3:
125126
needs: [build_images_base, build_images_stage_1, build_images_stage_2]
126127
name: Build Docker CHIP Build images - stage 3

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
runs-on: ubuntu-latest
8686
container:
87-
image: ghcr.io/project-chip/chip-build-doxygen:90
87+
image: ghcr.io/project-chip/chip-build-doxygen:97
8888

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

‎.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-ameba:90
42+
image: ghcr.io/project-chip/chip-build-ameba:97
4343
options: --user root
4444

4545
steps:

‎.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-asr:90
40+
image: ghcr.io/project-chip/chip-build-asr:97
4141
options: --user root
4242

4343
steps:

0 commit comments

Comments
 (0)