Skip to content

Commit

Permalink
Merge branch 'master' into handle-announce-ota-provider
Browse files Browse the repository at this point in the history
  • Loading branch information
holbrookt committed Oct 26, 2021
2 parents d7c9eaa + febbaa6 commit b751b49
Show file tree
Hide file tree
Showing 338 changed files with 31,507 additions and 17,834 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.18"
"BUILD_VERSION": "0.5.22"
}
},
"remoteUser": "vscode",
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
# And some specific generated files
src/controller/python/chip/clusters/CHIPClusters.cpp linguist-generated
src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
src/controller/python/chip/clusters/Objects.py linguist-generated
src/darwin/Framework/CHIPTests/CHIPClustersTests.m linguist-generated
7 changes: 5 additions & 2 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ AE
aef
algs
alloc
Ameba
ameba
Ameba
amebad
amebaiot
AnnounceOTAProvider
Expand Down Expand Up @@ -131,6 +131,7 @@ cgroup
changeset
characterised
CharString
checkmark
ChipBLEMgr
CHIPCirqueTest
CHIPCryptoPALHsm
Expand Down Expand Up @@ -324,6 +325,7 @@ EndpointId
endpointName
eno
entrypoint
enum
env
esd
ESPPORT
Expand Down Expand Up @@ -795,9 +797,9 @@ ScriptBinding
SDC
SDHC
SDK
SDK's
sdkconfig
SDKs
SDK's
SDKTARGETSYSROOT
sdl
segger
Expand Down Expand Up @@ -875,6 +877,7 @@ TCP
teardown
Telink
TemperatureMeasurement
testability
TestArray
TestCluster
TestEmptyString
Expand Down
4 changes: 2 additions & 2 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.18
image: connectedhomeip/chip-build-android:0.5.22
volumes:
- "/tmp/log_output:/tmp/test_logs"

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 @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

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

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .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.18
image: connectedhomeip/chip-build:0.5.22
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.18
DOCKER_RUN_VERSION: 0.5.22
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.18
# image: connectedhomeip/chip-build-cirque:0.5.22
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Copyright (c) 2020-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: Docker CHIP images

on:
push:
paths:
- 'integrations/docker/images/**'
pull_request:
paths:
- 'integrations/docker/images/**'
workflow_dispatch:

jobs:
build_images:
name: Build Docker CHIP Build images
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
strategy:
fail-fast: false
matrix:
# TODO: Enables "-crosscompile" and "-vscode" images
img: ["", "-android", "-cirque", "-efr32", "-esp32", "-esp32-qemu", "-infineon", "-k32w", "-mbed-os", "-nrf-platform", "-telink", "-tizen"]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build All images using project bash script
run: |
cd integrations/docker/images/chip-build${{ matrix.img }}
./build.sh --latest
- name: Scan for vulnerabilities
uses: crazy-max/docker-scan-action@master
with:
image: connectedhomeip/chip-build${{ matrix.img }}:latest
annotations: true

2 changes: 1 addition & 1 deletion .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
esp32:
name: ESP32
timeout-minutes: 70
timeout-minutes: 85

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

container:
image: connectedhomeip/chip-build-infineon:0.5.18
image: connectedhomeip/chip-build-infineon:0.5.22

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

container:
image: connectedhomeip/chip-build:0.5.18
image: connectedhomeip/chip-build:0.5.22
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
- "/tmp/output_binaries:/tmp/output_binaries"
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/examples-mbed.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: connectedhomeip/chip-build-mbed-os:0.5.18
image: connectedhomeip/chip-build-mbed-os:0.5.22
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
- "/tmp/output_binaries:/tmp/output_binaries"
Expand Down Expand Up @@ -82,6 +82,24 @@ jobs:
examples/lighting-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-lighting-app-example.elf \
/tmp/bloat_reports/
- name: Build pigweed-app example
timeout-minutes: 10
run: |
scripts/examples/mbed_example.sh -a=pigweed-app -b=$APP_TARGET -p=$APP_PROFILE
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
mbed $APP_TARGET+$APP_PROFILE pigweed-app \
examples/pigweed-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-pigweed-app-example.elf \
/tmp/bloat_reports/
- name: Build all-clusters-app example
timeout-minutes: 10
run: |
scripts/examples/mbed_example.sh -a=all-clusters-app -b=$APP_TARGET -p=$APP_PROFILE
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
mbed $APP_TARGET+$APP_PROFILE all-clusters-app \
examples/all-clusters-app/mbed/build-CY8CPROTO_062_4343W/release/chip-mbed-all-clusters-app-example.elf \
/tmp/bloat_reports/
- name: Build unit tests
timeout-minutes: 10
run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
Expand All @@ -93,6 +111,8 @@ jobs:
/tmp/output_binaries/$BUILD_TYPE-build/lock-app-$APP_TARGET-$APP_PROFILE.hex
cp examples/lighting-app/mbed/build-$APP_TARGET/$APP_PROFILE/chip-mbed-lighting-app-example.hex \
/tmp/output_binaries/$BUILD_TYPE-build/lighting-app-$APP_TARGET-$APP_PROFILE.hex
cp examples/all-clusters-app/mbed/build-$APP_TARGET/$APP_PROFILE/chip-mbed-all-clusters-app-example.hex \
/tmp/output_binaries/$BUILD_TYPE-build/all-clusters-app-$APP_TARGET-$APP_PROFILE.hex
- name: Binary artifacts suffix
id: outsuffix
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.5.18
image: connectedhomeip/chip-build-nrf-platform:0.5.22
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
- "/tmp/output_binaries:/tmp/output_binaries"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.18
image: connectedhomeip/chip-build:0.5.22
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
- "/tmp/output_binaries:/tmp/output_binaries"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-telink:0.5.18
image: connectedhomeip/chip-build-telink:0.5.22
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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

container:
image: connectedhomeip/chip-build-tizen:0.5.18
image: connectedhomeip/chip-build-tizen:0.5.22
options: --user root
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.18
image: connectedhomeip/chip-build:0.5.22
options:
--privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
# actually succeeded, because that just wastes space.
rsync -a out/debug/standalone/ objdir-clone || true
- name: Run Tests
timeout-minutes: 10
timeout-minutes: 20
run: |
scripts/tests/test_suites.sh
- name: Run TV Tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.18
image: connectedhomeip/chip-build:0.5.22
volumes:
- "/tmp/log_output:/tmp/test_logs"
- "/tmp/happy_test_logs:/tmp/happy_test_logs"
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/zap_regeneration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Copyright (c) 2020 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: ZAP - Regenerate

on:
workflow_dispatch:
issue_comment:
types: [created]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
cancel-in-progress: true

jobs:
zap_regenerate:
name: ZAP - Regenerate
timeout-minutes: 60

runs-on: ubuntu-18.04
if: (github.event.issue.pull_request != '' && contains(github.event.comment.body, '/regenerate')) || (github.event_name == 'workflow_dispatch')

steps:
- name: Checkout
uses: actions/checkout@v2
with:
#token: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: Use Node.js 14.x
uses: actions/setup-node@v2
with:
node-version: '14'
- name: Use Java
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
java-package: jre
- run: sudo apt-get update
- run: sudo apt-get install -fy --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
- name: Rebase and regenerate
run: scripts/helpers/rebase_and_regenerate_zap.sh
env:
GITHUB_TOKEN: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
Loading

0 comments on commit b751b49

Please sign in to comment.