Skip to content

Commit

Permalink
Merge branch 'master' into improve_nrf
Browse files Browse the repository at this point in the history
  • Loading branch information
electrocucaracha authored Oct 29, 2021
2 parents e6895cc + e4407c4 commit e6c2ac7
Show file tree
Hide file tree
Showing 643 changed files with 58,709 additions and 26,727 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.5.22"
"BUILD_VERSION": "0.5.23"
}
},
"remoteUser": "vscode",
Expand Down
33 changes: 32 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ argc
args
argv
armeabi
ARMmbed
armv
asdk
ASYNC
Expand All @@ -58,6 +59,7 @@ attrMask
attSizeBytes
attType
ATW
ATWC
AudioOutput
auth
autoconnect
Expand All @@ -68,6 +70,7 @@ autotools
avL
AwaitNextAction
AXXXF
AYNJV
babaf
backend
backticks
Expand Down Expand Up @@ -117,6 +120,7 @@ CACACACA
cacerts
CAfile
cancelled
capacitive
CBB
cbd
CCMP
Expand All @@ -138,13 +142,16 @@ CHIPCryptoPALHsm
CHIPDeviceController
ChipDeviceCtrl
CHIPDeviceEvent
CHIPDevicePlatformConfig
CHIPDevicePlatformEvent
ChipEchoRequester
ChipEchoResponder
ChipImInitiator
ChipImResponder
ChipLight
ChipMessageLayer
CHIPOBLE
CHIPProjectConfig
CHIPTest
CHIPTool
chmod
Expand All @@ -166,6 +173,7 @@ clusterListName
ClusterRevision
ClusterTestGeneration
cmake
CMakeLists
CMD
CMSIS
CMVH
Expand Down Expand Up @@ -204,6 +212,7 @@ cp
cpio
cpp
cppreference
CPROTO
cpuapp
cpython
crypto
Expand Down Expand Up @@ -301,6 +310,7 @@ eabi
EB
ECC
ECD
EchoMessage
EchoRequests
EchoResponse
EchoService
Expand Down Expand Up @@ -391,6 +401,7 @@ GetDeviceInfo
GetDns
GetIP
getstarted
githubusercontent
gitignore
glibc
gn
Expand Down Expand Up @@ -521,10 +532,12 @@ lifecycle
lightbulb
lightin
LightingColor
LightingState
LinkSoftwareAndDocumentationPack
LocalConfigDisabled
localhost
localstatedir
LockingState
loopback
LowPower
LPC
Expand All @@ -550,10 +563,16 @@ matterc
matterd
MatterLock
matterSdkSourceBuild
matterSourceBuildAbiFilters
matterUTestLib
MaxInterval
MaxIntervalCeilingSeconds
MaxRtrAdvInterval
mbed
MbedCommissioning
MbedNewTarget
mbedos
mbedTarget
mbedTLS
mcu
MCUboot
Expand All @@ -578,6 +597,7 @@ MfrDeviceCert
MfrDeviceId
mgmt
microcontroller
microcontrollers
MicroSD
middleware
Minicom
Expand All @@ -603,6 +623,8 @@ Multiband
Multicast
multilib
Multiprotocol
multithreaded
mutexes
MX
mydir
MyPASSWORD
Expand Down Expand Up @@ -649,6 +671,7 @@ OnOff
OnOffClusterTest
OnPlatformEvent
OO
OpenOCD
OpenSSL
OpenThread
OpenThreadDemo
Expand Down Expand Up @@ -686,6 +709,7 @@ peerAddrStr
pem
percentageLiftValue
pexpect
pickString
PID
Pigweed
PinCode
Expand All @@ -710,15 +734,18 @@ productrev
ProductRevision
ProductURL
proto
protobuf
protos
Prover
PRs
PSCAN
PSK
PSoC
PTR
pts
PumpConfigurationAndControl
pwd
PWM
PXXXF
py
pychip
Expand Down Expand Up @@ -764,6 +791,7 @@ repo
req
Requestor
responder
retargeting
reusability
rfid
rfids
Expand Down Expand Up @@ -797,8 +825,8 @@ ScriptBinding
SDC
SDHC
SDK
SDK's
sdkconfig
SDK's
SDKs
SDKTARGETSYSROOT
sdl
Expand Down Expand Up @@ -833,6 +861,7 @@ softmmu
SoftwareDiagnostics
SoftwareVersion
SoftwareVersionString
SPI
spinel
src
SRP
Expand All @@ -842,6 +871,7 @@ startoffset
StartScan
stderr
stdout
sterm
str
strcpy
su
Expand Down Expand Up @@ -873,6 +903,7 @@ systemduserunitdir
sysv
TargetNavigator
TBD
tcl
TCP
teardown
Telink
Expand Down
1 change: 1 addition & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ todo:
autoAssign: true # string|string[]|boolean
label: ["todo"] # boolean|string|string[]
reopenClosed: true # boolean
exclude: ".*lint\\.yaml|.*/(zzz_generated|zap-generated)/.*" # string
12 changes: 8 additions & 4 deletions .github/workflows/android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:
jobs:
android:
name: Build Android
timeout-minutes: 60
timeout-minutes: 75

env:
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/
Expand All @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-android:0.5.22
image: connectedhomeip/chip-build-android:0.5.23
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand All @@ -54,10 +54,14 @@ jobs:
path: |
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build android examples
- name: Build Android CHIPTool and CHIPTest
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-*' build"
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64,x64,x86}-chip-*' build"
- name: Build Android Studio build (arm64 only)
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"
- name: Run Android build rule tests
run: |
./scripts/run_in_build_env.sh \
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,17 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.22
image: connectedhomeip/chip-build:0.5.23

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Report
run: |
scripts/helpers/bloat_check.py \
--github-repository project-chip/connectedhomeip \
--github-api-token "${{ secrets.GITHUB_TOKEN }}"
- name: Report2
run: |
scripts/tools/memory/gh_report.py \
--verbose \
--report-increases 1 \
--report-increases 0.2 \
--report-pr \
--github-comment \
--github-limit-artifact-pages 50 \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.22
image: connectedhomeip/chip-build:0.5.23
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:latest
image: connectedhomeip/chip-build:0.5.23
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:latest
image: connectedhomeip/chip-build:0.5.23
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 60

env:
DOCKER_RUN_VERSION: 0.5.22
DOCKER_RUN_VERSION: 0.5.23
GITHUB_CACHE_PATH: /tmp/cirque-cache/

runs-on: ubuntu-latest
Expand All @@ -38,7 +38,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: connectedhomeip/chip-build-cirque:0.5.22
# image: connectedhomeip/chip-build-cirque:0.5.23
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:
- name: Scan for vulnerabilities
uses: crazy-max/docker-scan-action@master
with:
image: connectedhomeip/chip-build${{ matrix.img }}:latest
image: connectedhomeip/chip-build${{ matrix.img }}:0.5.23
annotations: true

41 changes: 41 additions & 0 deletions .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Copyright (c) 2021 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Build example - Ameba

on:
push:
pull_request:

jobs:
ameba:
name: Ameba
env:
BUILD_TYPE: ameba

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

container:
image: connectedhomeip/chip-build-ameba:0.5.23
options: --user root

steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true
- name: Build example Ameba All Clusters App
run:
scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target-glob 'ameba-*' build"
Loading

0 comments on commit e6c2ac7

Please sign in to comment.