Skip to content

Commit

Permalink
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
Browse files Browse the repository at this point in the history
… tv2-2
  • Loading branch information
chrisdecenzo committed Jan 15, 2024
2 parents 8af2d86 + c48a435 commit 54e55bf
Show file tree
Hide file tree
Showing 1,415 changed files with 195,995 additions and 29,936 deletions.
19 changes: 14 additions & 5 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 @@ -298,8 +301,8 @@ connstring
conntype
const
ContentApp
ContentAppPlatform
ContentApp's
ContentAppPlatform
ContentLaunch
ContentLauncher
continuousHinting
Expand Down Expand Up @@ -655,13 +658,13 @@ iaszone
ibb
ICA
ICD
ICDs
iCloud
ICMP
IDF
IDL
IDLs
idt
IDT
idx
ifconfig
ifdef
Expand Down Expand Up @@ -793,7 +796,6 @@ LightingColor
LightingState
LinkSoftwareAndDocumentationPack
lladdr
LLADDR
LocalConfigDisabled
localedef
localhost
Expand Down Expand Up @@ -914,6 +916,7 @@ namespacing
nano
natively
navpad
NCP
ncs
nding
NDK
Expand Down Expand Up @@ -1021,6 +1024,7 @@ PairDevice
PAIs
PAKE
palletsprojects
PANID
pankore
param
params
Expand Down Expand Up @@ -1157,8 +1161,8 @@ REPL
repo
req
Requestor
RequestorCanConsent
Requestor's
RequestorCanConsent
Requestors
responder
RestrictedEvent
Expand Down Expand Up @@ -1213,8 +1217,8 @@ SDB
SDC
SDHC
SDK
sdkconfig
SDK's
sdkconfig
SDKs
SDKTARGETSYSROOT
sdl
Expand All @@ -1227,6 +1231,7 @@ SendNewInputEvent
sendto
seqdiag
SERIALDEVICE
serialno
SerialNumber
ServiceId
SetDns
Expand Down Expand Up @@ -1336,12 +1341,14 @@ systime
sysv
TargetNavigator
TBD
tbody
tcl
TCP
teardown
Telink
TemperatureMeasurement
templating
Tera
testability
TestArray
TestCluster
Expand Down Expand Up @@ -1470,6 +1477,7 @@ utils
UUID
ux
validator
vcom
VCP
Vectorcall
VendorID
Expand Down Expand Up @@ -1497,6 +1505,7 @@ WantedBy
watchdogTimeout
watchOS
webpage
wf
wg
wget
whde
Expand Down
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:26
image: ghcr.io/project-chip/chip-build:32

steps:
- name: Checkout
Expand Down
26 changes: 13 additions & 13 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:26
image: ghcr.io/project-chip/chip-build:32
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
platform: linux
- name: Initialize CodeQL
if: ${{ inputs.run-codeql }}
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "cpp"
- name: Setup Build
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Run Build Without Logging
run: scripts/run_in_build_env.sh "ninja -C ./out"
- name: Uploading core files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-linux-gcc-debug
Expand All @@ -120,7 +120,7 @@ jobs:
# If re-enabling, some subset of this should be picked
#
# - name: Uploading objdir for debugging
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# if: ${{ failure() && !env.ACT }}
# with:
# name: crash-objdir-linux-gcc-debug
Expand All @@ -135,7 +135,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:26
image: ghcr.io/project-chip/chip-build:32
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
platform: linux
- name: Initialize CodeQL
if: ${{ inputs.run-codeql }}
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "cpp"
- name: Setup and Build Simulated Device
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
language: cpp

- name: Uploading core files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-linux
Expand All @@ -268,7 +268,7 @@ jobs:
# If re-enabling, some subset of this should be picked
#
# - name: Uploading objdir for debugging
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# if: ${{ failure() && !env.ACT }}
# with:
# name: crash-objdir-linux
Expand All @@ -283,7 +283,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

container:
image: ghcr.io/project-chip/chip-build:26
image: ghcr.io/project-chip/chip-build:32
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -386,7 +386,7 @@ jobs:
mkdir -p ~/Library/Logs/DiagnosticReports || true
- name: Initialize CodeQL
if: ${{ inputs.run-codeql }}
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "cpp"

Expand Down Expand Up @@ -429,7 +429,7 @@ jobs:
check \
"
- name: Uploading diagnostic logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-log-darwin
Expand All @@ -451,7 +451,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:26
image: ghcr.io/project-chip/chip-build:32
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:26
image: ghcr.io/project-chip/chip-build:32
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:26
image: ghcr.io/project-chip/chip-build-esp32:32
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:26
image: ghcr.io/project-chip/chip-build-nrf-platform:32
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:26
image: ghcr.io/project-chip/chip-build-telink:32
options: --user root

steps:
Expand Down
9 changes: 6 additions & 3 deletions .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:26
# image: ghcr.io/project-chip/chip-build-cirque:32
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down Expand Up @@ -90,7 +90,10 @@ jobs:
--env GITHUB_ACTION_RUN=1 \
--env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
--volume /tmp:/tmp \
-- scripts/tests/cirque_tests.sh bootstrap
-- sh -c " \
git config --global --add safe.directory '*' \
&& scripts/tests/cirque_tests.sh bootstrap \
"
- name: Artifact suffix
id: outsuffix
Expand Down Expand Up @@ -123,7 +126,7 @@ jobs:
- name: Uploading Binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && !env.ACT }}
with:
name: cirque_log-${{steps.outsuffix.outputs.value}}-logs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,27 @@ jobs:
--ota-candidate-file /tmp/otaCandidateJSON \
"
- name: Uploading core files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-darwin-${{ matrix.build_variant }}
path: /cores/
# Cores are big; don't hold on to them too long.
retention-days: 5
- name: Uploading diagnostic logs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-log-darwin-${{ matrix.build_variant }}
path: ~/Library/Logs/DiagnosticReports/
- name: Uploading framework build log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL}
path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
- name: Uploading objdir for debugging
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: crash-objdir-darwin-${{ matrix.build_variant }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
- name: Uploading log files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ failure() && !env.ACT }}
with:
name: darwin-framework-test-logs
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:26
image: ghcr.io/project-chip/chip-build-doxygen:32

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:26
image: ghcr.io/project-chip/chip-build-ameba:32
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-asr:26
image: ghcr.io/project-chip/chip-build-asr:32
options: --user root

steps:
Expand Down
Loading

0 comments on commit 54e55bf

Please sign in to comment.