Skip to content

Commit

Permalink
Merge branch 'master' into additional-ameba-implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
pankore authored Oct 20, 2023
2 parents b9de5a5 + 349b795 commit adb9b7c
Show file tree
Hide file tree
Showing 1,302 changed files with 232,874 additions and 646,145 deletions.
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 20",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"customizations": {
Expand Down
17 changes: 14 additions & 3 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ connstring
conntype
const
ContentApp
ContentApp's
ContentAppPlatform
ContentApp's
ContentLaunch
ContentLauncher
continuousHinting
Expand Down Expand Up @@ -477,6 +477,7 @@ edaf
edc
EDR
ee
eea
EEE
eef
ef
Expand Down Expand Up @@ -659,6 +660,8 @@ ICMP
IDF
IDL
IDLs
idt
IDT
idx
ifconfig
ifdef
Expand Down Expand Up @@ -789,6 +792,8 @@ LightingApp
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
lladdr
LLADDR
LocalConfigDisabled
localedef
localhost
Expand Down Expand Up @@ -926,6 +931,7 @@ nl
NLUnitTest
NLUnitTests
nmcli
nmtui
noc
NodeId
nongnu
Expand Down Expand Up @@ -1021,11 +1027,14 @@ params
PartNumber
PASE
Passcode
passRetained
passwd
PBKDF
pbuf
pbufs
pbxproj
PCA
pcap
pcaps
PDFs
PDK
Expand All @@ -1051,6 +1060,7 @@ PlatformManager
PlatformManagerImpl
plt
png
Podman
PollControl
pollInterval
polymorphism
Expand Down Expand Up @@ -1147,8 +1157,8 @@ REPL
repo
req
Requestor
Requestor's
RequestorCanConsent
Requestor's
Requestors
responder
RestrictedEvent
Expand All @@ -1167,6 +1177,7 @@ rootfs
RPC
RPCs
RPi
RPi's
RPis
RSA
rsn
Expand Down Expand Up @@ -1202,8 +1213,8 @@ SDB
SDC
SDHC
SDK
SDK's
sdkconfig
SDK's
SDKs
SDKTARGETSYSROOT
sdl
Expand Down
14 changes: 14 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,8 @@ inputs:
runs:
using: "composite"
steps:
- name: Dump disk info
uses: ./.github/actions/dump-disk-info
- name: Checkout submodules
uses: ./.github/actions/checkout-submodules
with:
Expand All @@ -26,6 +28,18 @@ runs:
uses: ./.github/actions/bootstrap
with:
platform: ${{ inputs.platform }}
- name: Remove CIPD cache directory
# If there is a bootstrap-cache miss, and bootstrap installs CIPD itself,
# there is roughly 1.4GB that remains in this cache that is useless from
# this point onwards.
shell: bash
continue-on-error: true
run: |
du -sh $HOME/.cipd-cache-dir/
rm -rf $HOME/.cipd-cache-dir/ || echo "Removing cipd cache dir failed"
- 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
8 changes: 8 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ tools:
# Tests
############################################################
tests:
- src/python_testing/*
- src/python_testing/**/*
- src/app/tests/*
- src/app/tests/**/*

Expand Down Expand Up @@ -123,6 +125,12 @@ core:
protocols:
- src/lib/protocols/*
- src/lib/protocols/**/*
- src/protocols/*
- src/protocols/**/*

messaging:
- src/messaging/*
- src/messaging/**/*

shell:
- src/lib/shell/*
Expand Down
76 changes: 76 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# .github/release.yml

changelog:
exclude:
labels:
- scripts
- external dependency
- submodules
- integrations
- documentation
authors:
- restyled-io
- octocat
- pullapprove
- jira
- issue-label-bot
- github-actions
- github-labels
- buildjet
categories:
- title: Highlighted Fixes
labels:
- release note
- title: Security Fixes
labels:
- security
- title: Bug Fixes
labels:
- bug
- title: Bluetooth Related Changes
labels:
- ble
- title: Spec Alignment Changes
labels:
- spec
- title: Transport/Messaging Layer Changes
labels:
- inet
- transport
- messaging
- protocols
- lwip
- title: Crypto Changes
labels:
- crypto
- title: Core Library Changes
labels:
- lib
- title: Core Changes
labels:
- core
- title: Controller Changes
labels:
- controller
- title: System Level Changes
labels:
- system
- attestation
- title: App Level Changes
labels:
- app
- title: Platform Changes
labels:
- platform
- darwin
- android
- title: Example App Changes
labels:
- examples
- title: Test Changes
labels:
- tests
- title: Build Related Changes
labels:
- gn
- build
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21

steps:
- name: Checkout
Expand Down
41 changes: 37 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -332,6 +332,39 @@ jobs:
pip3 install -r src/setup_payload/python/requirements.txt
python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
build_linux_python_lighting_device:
name: Build on Linux (python lighting-app)

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

steps:
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJSON(github) }}
run: echo "$GITHUB_CONTEXT"
- name: Dump Concurrency context
env:
CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
run: echo "$CONCURRENCY_CONTEXT"
- name: Checkout
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
platform: linux

- name: Setup Build
run: |
scripts/build_python_device.sh --chip_detail_logging true
build_darwin:
name: Build on Darwin (clang, python_lib, simulated)
runs-on: macos-latest
Expand Down Expand Up @@ -414,7 +447,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:1
image: ghcr.io/project-chip/chip-build:21
options: --user root

steps:
Expand All @@ -54,7 +54,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:2
image: ghcr.io/project-chip/chip-build-esp32:21
options: --user root

steps:
Expand All @@ -75,7 +75,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:1
image: ghcr.io/project-chip/chip-build-nrf-platform:21
options: --user root

steps:
Expand All @@ -96,7 +96,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-telink:16
image: ghcr.io/project-chip/chip-build-telink:21
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
# image: ghcr.io/project-chip/chip-build-cirque:0.8
# image: ghcr.io/project-chip/chip-build-cirque:21
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ghcr.io/project-chip/chip-build-doxygen:1
image: ghcr.io/project-chip/chip-build-doxygen:21

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

Expand Down
Loading

0 comments on commit adb9b7c

Please sign in to comment.