Skip to content

Commit

Permalink
Merging from master
Browse files Browse the repository at this point in the history
  • Loading branch information
rbultman committed Jan 8, 2024
2 parents 627da1f + 7381d76 commit 738db74
Show file tree
Hide file tree
Showing 3,810 changed files with 980,908 additions and 801,977 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
27 changes: 27 additions & 0 deletions .actrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This file contains settings for local github action runner act:
# https://github.com/nektos/act
#
# It is recommended to run specific jobs that you need, all jobs except those
# running on should darwin work.
# e.g. act -j build_linux
#
# It is recommended to set up a separate bridge network
# and possibly define it in ~/.actrc like so:
# --network=bridge
# https://docs.docker.com/network/drivers/bridge/

# Remove containers after finishing a job, comment out for debugging
--rm

# Reuse the checkout from host, otherwise act will do docker cp that makes
# running jobs a lot longer even on SSD. Clean up your .environment before
# running it.
--bind

# Easier to have 1:1 match between triggering jobs and reading logs when they
# use the same name
--log-prefix-job-id

# Default runner image does not include enough.
# https://github.com/nektos/act#default-runners-are-intentionally-incomplete
-P ubuntu-latest=catthehacker/ubuntu:full-latest
13 changes: 6 additions & 7 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,13 @@ 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/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
/opt/espressif/tools \
/opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
/opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
/opt/android/sdk `# allow licenses to be accepted` \
/opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
/opt/fsl-imx-xwayland/5.15-kirkstone/ \
/opt/openocd \
$IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
$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 \
&& :

# Fix Tizen SDK paths for new user
Expand Down
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 22",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"customizations": {
Expand Down
20 changes: 20 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ BarrierControl
BasicCHIPRegression
BasicInformation
baudrate
BCM
BD
BDX
BDXDownloader
Expand Down Expand Up @@ -248,6 +249,7 @@ CKIT
CLA
clapre
CLI
CLIs
cloudbuild
CLRF
clusterAttrs
Expand All @@ -264,6 +266,7 @@ CMS
CMSIS
CMVH
cn
COAP
codeaurora
codebase
codegen
Expand Down Expand Up @@ -477,6 +480,7 @@ edaf
edc
EDR
ee
eea
EEE
eef
ef
Expand Down Expand Up @@ -654,11 +658,13 @@ iaszone
ibb
ICA
ICD
ICDs
iCloud
ICMP
IDF
IDL
IDLs
idt
idx
ifconfig
ifdef
Expand Down Expand Up @@ -789,6 +795,7 @@ LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
lladdr
LocalConfigDisabled
localedef
localhost
Expand Down Expand Up @@ -909,6 +916,7 @@ namespacing
nano
natively
navpad
NCP
ncs
nding
NDK
Expand All @@ -926,6 +934,7 @@ nl
NLUnitTest
NLUnitTests
nmcli
nmtui
noc
NodeId
nongnu
Expand Down Expand Up @@ -1015,17 +1024,21 @@ PairDevice
PAIs
PAKE
palletsprojects
PANID
pankore
param
params
PartNumber
PASE
Passcode
passRetained
passwd
PBKDF
pbuf
pbufs
pbxproj
PCA
pcap
pcaps
PDFs
PDK
Expand All @@ -1051,6 +1064,7 @@ PlatformManager
PlatformManagerImpl
plt
png
Podman
PollControl
pollInterval
polymorphism
Expand Down Expand Up @@ -1167,6 +1181,7 @@ rootfs
RPC
RPCs
RPi
RPi's
RPis
RSA
rsn
Expand Down Expand Up @@ -1216,6 +1231,7 @@ SendNewInputEvent
sendto
seqdiag
SERIALDEVICE
serialno
SerialNumber
ServiceId
SetDns
Expand Down Expand Up @@ -1325,12 +1341,14 @@ systime
sysv
TargetNavigator
TBD
tbody
tcl
TCP
teardown
Telink
TemperatureMeasurement
templating
Tera
testability
TestArray
TestCluster
Expand Down Expand Up @@ -1459,6 +1477,7 @@ utils
UUID
ux
validator
vcom
VCP
Vectorcall
VendorID
Expand Down Expand Up @@ -1486,6 +1505,7 @@ WantedBy
watchdogTimeout
watchOS
webpage
wf
wg
wget
whde
Expand Down
9 changes: 9 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,10 @@ inputs:
runs:
using: "composite"
steps:
- name: Dump disk info
uses: ./.github/actions/dump-disk-info
- name: Set git safe directory for local act runs
uses: ./.github/actions/git-safe-directory
- name: Checkout submodules
uses: ./.github/actions/checkout-submodules
with:
Expand All @@ -24,8 +28,13 @@ runs:
uses: ./.github/actions/bootstrap-cache
- name: Bootstrap
uses: ./.github/actions/bootstrap
env:
PW_NO_CIPD_CACHE_DIR: Y
with:
platform: ${{ inputs.platform }}
- 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/with-post-step@v0.4.5
if: ${{ runner.os == 'Linux' }}
with:
main: |-
exec ./scripts/dump_diskspace_info.sh
post: |-
exec ./scripts/dump_diskspace_info.sh
9 changes: 9 additions & 0 deletions .github/actions/git-safe-directory/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Git safe directory
description: For running act with checkout owned by non-root user
runs:
using: "composite"
steps:
- name: Set git safe.directory to "*"
if: ${{ env.ACT }}
shell: bash
run: git config --system --add safe.directory '*'
2 changes: 1 addition & 1 deletion .github/boring-cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ labelPRBasedOnFilePath:
- src/darwin/*

efr32:
- src/platform/efr32/*
- src/platform/silabs/*

esp32:
- src/platform/ESP32/*
Expand Down
Loading

0 comments on commit 738db74

Please sign in to comment.