Skip to content

Commit e9a902f

Browse files
Merge remote-tracking branch 'upstream/master' into feature/add_lighting_app_ci
2 parents f35fe67 + cfdaf79 commit e9a902f

File tree

945 files changed

+43581
-21688
lines changed

Some content is hidden

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

945 files changed

+43581
-21688
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/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:94
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:94
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:94
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:94
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:94
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:94
494494
volumes:
495495
- "/:/runner-root-volume"
496496
- "/tmp/log_output:/tmp/test_logs"

.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:94
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:94
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:94
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:94
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 ffdbfe7560c0b628e03ab487ab110eeed9bdc8c7"
115115
- name: CI Examples Telink
116116
shell: bash
117117
run: |

.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:94
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:94
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:94
4141
options: --user root
4242

4343
steps:

.github/workflows/examples-bouffalolab.yaml

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

4040
container:
41-
image: ghcr.io/project-chip/chip-build-bouffalolab:90
41+
image: ghcr.io/project-chip/chip-build-bouffalolab:94
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/examples-cc13xx_26xx.yaml

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

4444
container:
45-
image: ghcr.io/project-chip/chip-build-ti:90
45+
image: ghcr.io/project-chip/chip-build-ti:94
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848
steps:

.github/workflows/examples-cc32xx.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-ti:90
44+
image: ghcr.io/project-chip/chip-build-ti:94
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/examples-efr32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:90
44+
image: ghcr.io/project-chip/chip-build-efr32:94
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/examples-esp32.yaml

+2-2
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-esp32:90
40+
image: ghcr.io/project-chip/chip-build-esp32:94
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

@@ -124,7 +124,7 @@ jobs:
124124
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
125125

126126
container:
127-
image: ghcr.io/project-chip/chip-build-esp32:90
127+
image: ghcr.io/project-chip/chip-build-esp32:94
128128
volumes:
129129
- "/tmp/bloat_reports:/tmp/bloat_reports"
130130

.github/workflows/examples-infineon.yaml

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

4040
container:
41-
image: ghcr.io/project-chip/chip-build-infineon:90
41+
image: ghcr.io/project-chip/chip-build-infineon:94
4242
env:
4343
# TODO: this should probably be part of the dockerfile itself
4444
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

.github/workflows/examples-linux-arm.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-crosscompile:90
40+
image: ghcr.io/project-chip/chip-build-crosscompile:94
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

.github/workflows/examples-linux-imx.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-imx:90
40+
image: ghcr.io/project-chip/chip-build-imx:94
4141

4242
steps:
4343
- name: Checkout

.github/workflows/examples-linux-standalone.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:90
40+
image: ghcr.io/project-chip/chip-build:94
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

.github/workflows/examples-linux-tv-casting-app.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:90
40+
image: ghcr.io/project-chip/chip-build:94
4141

4242
steps:
4343
- name: Checkout

.github/workflows/examples-mw320.yaml

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

4242
container:
43-
image: ghcr.io/project-chip/chip-build:90
43+
image: ghcr.io/project-chip/chip-build:94
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.github/workflows/examples-nrfconnect.yaml

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

4242
container:
43-
image: ghcr.io/project-chip/chip-build-nrf-platform:90
43+
image: ghcr.io/project-chip/chip-build-nrf-platform:94
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

0 commit comments

Comments
 (0)