Skip to content

Commit

Permalink
Merge 35781e5 into 1988399
Browse files Browse the repository at this point in the history
  • Loading branch information
ghost authored Feb 6, 2025
2 parents 1988399 + 35781e5 commit 2078657
Show file tree
Hide file tree
Showing 3,845 changed files with 331,958 additions and 275,985 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ RUN apt-get update \
icecc \
&& :

RUN groupadd -g $USER_GID $USERNAME \
RUN (getent passwd $USER_UID && userdel -f $(getent passwd $USER_UID | cut -d: -f1) || true) \
&& (getent group $USER_GID && groupdel -f $(getent group $USER_GID | cut -d: -f1) || true) \
&& (getent passwd $USERNAME && userdel -f $USERNAME || true) \
&& (getent group $USERNAME && groupdel -f $USERNAME || true) \
&& groupadd -g $USER_GID $USERNAME \
&& useradd --no-log-init -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $USERNAME \
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
&& chmod 0440 /etc/sudoers.d/$USERNAME \
Expand Down
22 changes: 14 additions & 8 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{
"name": "CHIP Ubuntu Development Environment",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined",
"--network=host",
"--privileged",
"-v",
"/dev/bus/usb:/dev/bus/usb:ro",
"--device-cgroup-rule=a 189:* rmw",
"--add-host=host.docker.internal:host-gateway"
],
"privileged": true,
"capAdd": ["SYS_PTRACE"],
"securityOpt": ["seccomp=unconfined"],
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
{
"source": "/var/run/docker.sock",
"target": "/var/run/docker.sock",
"type": "bind"
},
{
"source": "/dev/bus/usb",
"target": "/dev/bus/usb",
"type": "bind"
}
],
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"containerEnv": {
Expand Down
17 changes: 17 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ AFL
AIDL
algs
alloc
allocator
allocators
Ambrose
Ameba
amebad
amebaiot
Expand Down Expand Up @@ -317,6 +320,7 @@ cryptographic
CSA
csg
csrrequest
cstdint
csu
csv
ctl
Expand Down Expand Up @@ -440,6 +444,7 @@ DNSStubListener
docbuild
Dockerfile
Dockerfiles
docstrings
Don'ts
DoorLock
DoorState
Expand Down Expand Up @@ -565,6 +570,8 @@ FlowMeasurement
FluorideConcentrationMeasurement
focusable
forkpty
formatter
formatters
FOTA
FreeRTOS
FreeRTOSConfig
Expand Down Expand Up @@ -731,10 +738,12 @@ IPython
ISCAN
isHexString
isLowerCase
isort
isUpperCase
itemName
iterable
itsfoss
IW
JDK
jinja
JLink
Expand Down Expand Up @@ -877,6 +886,7 @@ MediaPlayback
MediaTek
MEI
mem
memcpy
memdf
MemMonitoring
menuconfig
Expand All @@ -893,6 +903,7 @@ microcontroller
microcontrollers
MicroSD
middleware
MIMXRT
minApplicableSoftwareVersion
Minicom
MinInterval
Expand Down Expand Up @@ -924,12 +935,14 @@ Multicast
multilib
Multiprotocol
multithreaded
Murata
mutex
mutexes
mv
MX
mydir
MyPASSWORD
mypy
MySSID
NAMESERVER
NAMESPACE
Expand Down Expand Up @@ -1182,6 +1195,7 @@ rebase
recommand
recommanded
recurse
refrigeratoralarm
regen
registerAttributeAccessOverride
RegisterCommandHandler
Expand Down Expand Up @@ -1439,6 +1453,7 @@ toJson
tokenization
tokenized
tokenizer
toml
toolchain
toolchains
topologies
Expand All @@ -1452,6 +1467,8 @@ trackFree
TransferSession
transitionTime
TransportMgrBase
triaged
triaging
TriggerEffect
TRNG
trustm
Expand Down
19 changes: 13 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
> !!!!!!!!!! Please delete the instructions below and replace with PR description

#### Testing

> !!!!!!!!!! Please delete the instructions below and replace with PR
> description above.
>
> If you have an issue number, please use a syntax of
> `Fixes #12345` and a brief change description
> If you have an issue number, please use a syntax of `Fixes #12345` and a brief
> change description
>
> If you do not have an issue number, please have a good description of
> the problem and the fix. Help the reviewer understand what to expect.
> If you do not have an issue number, please have a good description of the
> problem and the fix. Help the reviewer understand what to expect.
>
> Complete/append to the `### Testing` section above, to describe how testing
> was done. See
> <https://github.com/project-chip/connectedhomeip/blob/master/CONTRIBUTING.md#pull-requests>
>
> Make sure you delete these instructions (to prove you have read them).
>
> !!!!!!!!!! Instructions end
14 changes: 12 additions & 2 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,18 @@ darwin:
# (?![a-z]) means "there is no next char in the range a-z".
- "/(\\b[Ii][Oo][Ss](?![a-zA-Z])|[Hh][Oo][Mm][Ee][Pp][Oo][Dd]|[Dd][Aa][Rr][Ww][Ii][Nn]|\\bm[Aa][Cc]\\b|\\bMa[Cc]\\b|\\bM[Aa]c\\b|[Mm][Aa][Cc][Oo][Ss])/"

linux:
- "/(linux)/i"

# NOTE:
# Linux intentionally disabled: most people compile either on linux or darwin and
# as a result a lot of issues get tagged as such even though they are not platform specific
# (e.g. we get test case failures reported as linux even though they are just normal
# test runs)
#
# Linux label should be reserved to platform-specific problems (usually bootstrap/packages
# or integration with wifi/ethernet/bluetootn/etc.)
#
# linux:
# - "/(linux)/i"

# Special Keywords for Cert Blockers
air purifiers:
Expand Down
37 changes: 25 additions & 12 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,6 @@ test driver:
- src/test_driver/*
- src/test_driver/**/*

# Cert tests touched: add current milestone delta-tracking label.
# TODO: Change after Aug 15, 2024
matter-1.4-te2-script-change:
- changed-files:
- any-glob-to-any-file:
- src/python_testing/*
- src/python_testing/**/*
- src/app/tests/suites/certification/*

############################################################
# Source Code
############################################################
Expand Down Expand Up @@ -275,38 +266,54 @@ darwin:
silabs:
- changed-files:
- any-glob-to-any-file:
- examples/platform/silabs/*
- examples/platform/silabs/**/*
- src/platform/silabs/*
- src/platform/silabs/**/*
- src/test_driver/efr32/*
- src/test_driver/efr32/**/*

esp32:
- changed-files:
- any-glob-to-any-file:
- examples/platform/esp32/*
- examples/platform/esp32/**/*
- src/platform/ESP32/*
- src/platform/ESP32/**/*
- src/test_driver/esp32/*
- src/test_driver/esp32/**/*

freeRTOS:
- changed-files:
- any-glob-to-any-file:
- src/platform/FreeRTOS/*
- src/platform/FreeRTOS/**/*

k32w:
nxp:
- changed-files:
- any-glob-to-any-file:
- src/platform/K32W/*
- src/platform/K32W/**/*
- examples/platform/nxp/*
- examples/platform/nxp/**/*
- src/platform/nxp/*
- src/platform/nxp/**/*

linux:
- changed-files:
- any-glob-to-any-file:
- examples/platform/linux/*
- examples/platform/linux/**/*
- src/platform/Linux/*
- src/platform/Linux/**/*

nrf connect:
- changed-files:
- any-glob-to-any-file:
- examples/platform/nrfconnect/*
- examples/platform/nrfconnect/**/*
- src/platform/nrfconnect/*
- src/platform/nrfconnect/**/*
- src/test_driver/nrfconnect/*
- src/test_driver/nrfconnect/**/*

openthread:
- changed-files:
Expand All @@ -323,11 +330,17 @@ zephyr:
telink:
- changed-files:
- any-glob-to-any-file:
- examples/platform/telink/*
- examples/platform/telink/**/*
- src/platform/telink/*
- src/platform/telink/**/*

tizen:
- changed-files:
- any-glob-to-any-file:
- examples/platform/tizen/*
- examples/platform/tizen/**/*
- src/platform/Tizen/*
- src/platform/Tizen/**/*
- src/test_driver/tizen/*
- src/test_driver/tizen/**/*
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:81
image: ghcr.io/project-chip/chip-build:104

steps:
- name: Checkout
Expand Down
Loading

0 comments on commit 2078657

Please sign in to comment.