Skip to content

Commit

Permalink
Merge branch 'master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
gvargas-csa committed Nov 20, 2024
2 parents bc91a9c + c197bc2 commit fe49d16
Show file tree
Hide file tree
Showing 6,016 changed files with 674,527 additions and 497,011 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Checks: >
-bugprone-multi-level-implicit-pointer-conversion,
-bugprone-narrowing-conversions,
-bugprone-not-null-terminated-result,
-bugprone-pointer-arithmetic-on-polymorphic-object,
-bugprone-reserved-identifier,
-bugprone-signed-char-misuse,
-bugprone-suspicious-include,
Expand All @@ -45,6 +46,7 @@ Checks: >
-clang-analyzer-security.insecureAPI.rand,
-clang-analyzer-security.insecureAPI.strcpy,
-clang-analyzer-unix.Malloc,
-clang-diagnostic-implicit-int-conversion
-clang-diagnostic-implicit-int-conversion,
-clang-diagnostic-missing-template-arg-list-after-template-kw
WarningsAsErrors: '*'
HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'
57 changes: 39 additions & 18 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,28 @@ ARG USER_UID=1000
ARG USER_GID=$USER_UID
ENV LANG en_US.utf8

# these are installed for terminal/dev convenience. If more tooling for build is required, please
# add them to chip-build (in integrations/docker/images/chip-build)

# These are installed for terminal/dev convenience. If more tooling for build is required, please
# add them to chip-build (in integrations/docker/images/chip-build).
RUN apt-get update \
&& apt-get install -y locales \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
&& apt-get -fy install git vim emacs sudo \
&& apt-get -fy install vim emacs sudo \
apt-utils dialog zsh \
iproute2 procps lsb-release \
lsb-release \
bash-completion \
build-essential cmake cppcheck valgrind \
wget curl telnet \
valgrind \
docker.io \
iputils-ping net-tools \
libncurses5 \
libncursesw5 \
libpython2.7 \
iputils-ping \
icecc \
&& :

RUN groupadd -g $USER_GID $USERNAME \
&& useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker,sudo -m $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 All @@ -55,13 +57,22 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
RUN mkdir -p /opt/sdk/sdks/ \
&& chown -R $USERNAME:$USERNAME \
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
/opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
$IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
$ANDROID_HOME \
$IDF_TOOLS_PATH \
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
&& chmod -R +x \
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
&& chmod -R +w \
$IDF_TOOLS_PATH \
$SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
$ANDROID_HOME `# allow licenses to be accepted` \
$AMEBA_PATH `# AmebaD requires access to change build_info.h` \
$IMX_SDK_ROOT \
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
# Safe directory is preffered over chown.
&& git config --global --add safe.directory "*" \
&& :

# Fix Tizen SDK paths for new user
Expand All @@ -74,3 +85,13 @@ ENV TIZEN_ROOTFS /tizen_rootfs

# Fast Model GDB plugins path for debugging support
ENV FAST_MODEL_PLUGINS_PATH /opt/FastModelsPortfolio_11.16/plugins/Linux64_GCC-9.3

# Set up ccache as a pigweed command launcher when using the scripts/build/build_examples.py
# script. Also, set up icecc as the command prefix for ccache. Such setup allows to benefit
# from compilation caching and distributed compilation at the same time.
#
# NOTE: In order to use distributed compilation with icecc, one should run
# "scripts/icecc.sh start" before starting the build.
ENV CHIP_PW_COMMAND_LAUNCHER ccache
ENV CCACHE_PREFIX icecc
ENV PATH /usr/lib/ccache:$PATH
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"containerEnv": {
"PW_ENVIRONMENT_ROOT": "${containerWorkspaceFolder}/.environment-vscode"
},
"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created in the array below.
Expand Down
37 changes: 35 additions & 2 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@ AdvSendAdvert
AE
aef
AES
AFL
AIDL
algs
alloc
allocator
allocators
Ambrose
Ameba
amebad
amebaiot
Expand Down Expand Up @@ -316,6 +320,7 @@ cryptographic
CSA
csg
csrrequest
cstdint
csu
csv
ctl
Expand All @@ -340,6 +345,7 @@ datamodel
DataModelRevision
dataset
datasets
datastore
DataVersion
dbf
DBG
Expand Down Expand Up @@ -402,6 +408,7 @@ DevKitM
devtype
df
dfe
DFILE
dfu
DgDxsfHx
dhclient
Expand Down Expand Up @@ -437,6 +444,7 @@ DNSStubListener
docbuild
Dockerfile
Dockerfiles
docstrings
Don'ts
DoorLock
DoorState
Expand All @@ -450,13 +458,16 @@ dpkg
dropdown
dryrun
DS
DSLS
duplicative
DUT
DUTS
DUT's
DV
DVK
dynload
eabi
EAF
EB
ECC
ECD
Expand Down Expand Up @@ -547,6 +558,7 @@ feff
ffaa
ffeebaefa
FFF
FFFFFFFFFFFF0102
fffe
fffff
Fi
Expand All @@ -558,15 +570,20 @@ FlowMeasurement
FluorideConcentrationMeasurement
focusable
forkpty
formatter
formatters
FOTA
FreeRTOS
FreeRTOSConfig
FS
fsl
fstab
fsync
ftd
fullclean
fuzzer
fuzzers
fuzztest
FW
gbl
gcloud
Expand Down Expand Up @@ -649,6 +666,7 @@ href
HSM
hsm
HTTPS
Humidistat
HW
hwadr
HydrogenConcentrationMeasurement
Expand Down Expand Up @@ -720,10 +738,12 @@ IPython
ISCAN
isHexString
isLowerCase
isort
isUpperCase
itemName
iterable
itsfoss
IW
JDK
jinja
JLink
Expand Down Expand Up @@ -852,6 +872,7 @@ MbedNewTarget
mbedos
mbedTarget
mbedTLS
MCORE
mcu
MCUboot
mcumgr
Expand All @@ -865,6 +886,7 @@ MediaPlayback
MediaTek
MEI
mem
memcpy
memdf
MemMonitoring
menuconfig
Expand All @@ -881,6 +903,7 @@ microcontroller
microcontrollers
MicroSD
middleware
MIMXRT
minApplicableSoftwareVersion
Minicom
MinInterval
Expand Down Expand Up @@ -912,12 +935,14 @@ Multicast
multilib
Multiprotocol
multithreaded
Murata
mutex
mutexes
mv
MX
mydir
MyPASSWORD
mypy
MySSID
NAMESERVER
NAMESPACE
Expand All @@ -943,8 +968,6 @@ NitricOxideConcentrationMeasurement
NitrogenDioxideConcentrationMeasurement
nl
nltest
NLUnitTest
NLUnitTests
nmcli
nmtui
noc
Expand Down Expand Up @@ -996,13 +1019,15 @@ OpenThreadDemo
openweave
OperationalCredentials
operationalDataset
operationalstate
opkg
OPTIGA
optionMask
optionOverride
optionsMask
optionsOverride
orgs
OSS
OTA
OTADownloader
otaDownloadPath
Expand Down Expand Up @@ -1354,6 +1379,7 @@ SVR
SWD
SWU
symlinks
sysbuild
sysconfdir
SysConfig
sysctl
Expand Down Expand Up @@ -1426,6 +1452,7 @@ toJson
tokenization
tokenized
tokenizer
toml
toolchain
toolchains
topologies
Expand All @@ -1439,6 +1466,8 @@ trackFree
TransferSession
transitionTime
TransportMgrBase
triaged
triaging
TriggerEffect
TRNG
trustm
Expand Down Expand Up @@ -1524,6 +1553,7 @@ virtualenv
visualstudio
vlatest
VLEDs
vm
vn
vnc
vous
Expand Down Expand Up @@ -1590,6 +1620,7 @@ xFFF
xFFFF
xfffff
xFFFFFFEFFFFFFFFF
XMLPICSValidator
xtensa
xvzf
xwayland
Expand All @@ -1616,3 +1647,5 @@ zhengyaohan
Zigbee
zigbeealliance
zigbeethread
zsdk
TBR
2 changes: 0 additions & 2 deletions .github/CODEOWNERS

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/bootstrap-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
attempt_limit: 3
attempt_delay: 2000
with: |
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
path: |
.environment
build_overrides/pigweed_environment.gni
7 changes: 6 additions & 1 deletion .github/actions/bootstrap/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@ runs:
# because the bootstrapped Pigweed environment contains absolute paths.
echo "Calculating bootstrap cache key for '$PWD'"
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
case "$RUNNER_OS" in
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
esac
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
# Split caches across backends
Expand Down
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ updates:
- dependency-name: "third_party/open-iot-sdk/repo"
- dependency-name: "third_party/ot-br-posix/repo"
- dependency-name: "third_party/perfetto/repo"
- dependency-name: "third_party/pybind11/repo"
- dependency-name: "third_party/qpg_sdk/repo"
- dependency-name: "third_party/silabs/repo"
- dependency-name: "third_party/simw-top-mini/repo"
Expand Down
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
Loading

0 comments on commit fe49d16

Please sign in to comment.