Skip to content

Commit

Permalink
Merge branch 'master' into create-admin-acl-entry
Browse files Browse the repository at this point in the history
  • Loading branch information
mlepage-google committed Jan 25, 2022
2 parents 09a945f + 68923b4 commit 336f454
Show file tree
Hide file tree
Showing 741 changed files with 47,811 additions and 38,036 deletions.
2 changes: 2 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/

# NXP uses a patch_sdk script to change SDK files
RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/

RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.10-hardknott/
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.5.48"
"BUILD_VERSION": "0.5.50"
}
},
"remoteUser": "vscode",
Expand Down
12 changes: 12 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ adb
AddOrUpdateThreadNetwork
AddOrUpdateWiFiNetwork
addr
AddThreadNetwork
adk
adoc
AdvAutonomous
Expand Down Expand Up @@ -252,12 +253,14 @@ customizations
cvfJ
cxx
CY
CYW
DAC
DAP
DataFrame
dataset
datasets
dbf
DBG
dBm
DBUILD
dbus
Expand Down Expand Up @@ -316,6 +319,7 @@ DMM
DNS
Dnsmasq
dnsmasqd
DNSSD
DNSStubListener
Dockerfile
Dockerfiles
Expand Down Expand Up @@ -355,6 +359,7 @@ elftools
elock
emberAfExternalAttributeReadCallback
emberAfExternalAttributeWriteCallback
EnableNetwork
EnableWiFiNetwork
EndpointId
endpointName
Expand Down Expand Up @@ -414,6 +419,7 @@ fsl
fstab
fsync
fullclean
gbl
gcloud
GDB
GeneralCommissioning
Expand Down Expand Up @@ -650,6 +656,7 @@ MoveToSaturation
MoveWithOnOff
MPSL
MRP
MTD
MTU
Multiband
Multicast
Expand Down Expand Up @@ -722,6 +729,7 @@ OTA
OTADownloader
OTAImageProcessorDriver
OTAImageProcessorInterface
OTAProvider
OTAProviderIpAddress
OTAProviderNodeId
OTAProviderSerialPort
Expand Down Expand Up @@ -837,6 +845,7 @@ RendezVousTest
repo
req
Requestor
Requestors
responder
retargeting
reusability
Expand Down Expand Up @@ -940,6 +949,7 @@ submodules
subprocess
SubscribeResponse
SubscriptionId
subtype
sudo
svg
SVR
Expand Down Expand Up @@ -978,6 +988,7 @@ testws
texinfo
textboxes
TFT
threadOperationalDataset
ThreadStackManager
ThreadStackManagerImpl
Thunderboard
Expand All @@ -988,6 +999,7 @@ TLV
tmp
tngvndl
TODO
tokenized
toolchain
toolchains
topologies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android.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: connectedhomeip/chip-build-android:0.5.48
image: connectedhomeip/chip-build-android:0.5.50
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand All @@ -57,7 +57,7 @@ jobs:
- name: Build Android CHIPTool and CHIPTest
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64,x64,x86}-chip-*' build"
"./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-{arm,arm64}-chip-*' build"
# - name: Build Android Studio build (arm64 only)
# run: |
# ./scripts/run_in_build_env.sh \
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.48
image: connectedhomeip/chip-build:0.5.50

steps:
- name: Checkout
Expand Down
11 changes: 8 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.48
image: connectedhomeip/chip-build:0.5.50
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down Expand Up @@ -90,6 +90,11 @@ jobs:
- name: Run Build Without Progress Logging
timeout-minutes: 20
run: scripts/run_in_build_env.sh "ninja -C ./out"
- name: Setup Build Without Error Logging
run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false chip_error_logging=false"
- name: Run Build Without Error Logging
timeout-minutes: 20
run: scripts/run_in_build_env.sh "ninja -C ./out"
build_linux:
name: Build on Linux (fake, gcc_release, clang, mbedtls, simulated)
timeout-minutes: 90
Expand All @@ -98,7 +103,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

container:
image: connectedhomeip/chip-build:0.5.48
image: connectedhomeip/chip-build:0.5.50
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.48
DOCKER_RUN_VERSION: 0.5.50
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.48
# image: connectedhomeip/chip-build-cirque:0.5.50
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
- "-esp32"
- "-esp32-qemu"
- "-infineon"
- "-imx"
- "-k32w"
- "-mbed-os"
- "-nrf-platform"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build-doxygen:0.5.48
image: connectedhomeip/chip-build-doxygen:0.5.50

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 @@ -28,7 +28,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

steps:
Expand Down
82 changes: 82 additions & 0 deletions .github/workflows/examples-cyw30739.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# 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 - Infineon CYW30739

on:
push:
pull_request:

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:
cyw30739:
name: CYW30739
timeout-minutes: 60

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

container:
image: connectedhomeip/chip-build:latest
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true

- name: Set up environment for size reports
if: ${{ !env.ACT }}
env:
GH_CONTEXT: ${{ toJson(github) }}
run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

- name: Bootstrap
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
if: ${{ always() }} && ${{ !env.ACT }}
with:
name: bootstrap-logs
path: |
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build example CYW30739 Lighting App
timeout-minutes: 10
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target cyw30739-cyw930739m2evb_01-light \
build \
--copy-artifacts-to out/artifacts \
"
- name: Get light size stats
timeout-minutes: 5
run: |
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
cyw30739 cyw930739m2evb_01 light \
out/artifacts/cyw30739-cyw930739m2evb_01-light/chip-cyw30739-lighting-example.elf \
/tmp/bloat_reports/
- name: Uploading Size Reports
uses: actions/upload-artifact@v2
if: ${{ !env.ACT }}
with:
name: Size,CYW30739-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
path: |
/tmp/bloat_reports/
4 changes: 2 additions & 2 deletions .github/workflows/examples-efr32.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-efr32:0.5.48
image: connectedhomeip/chip-build-efr32:0.5.50
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
timeout-minutes: 10
run: |
scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32/ out/lighting_app_debug_rpc BRD4161A \
-args='import("//with_pw_rpc.gni")'
'import("//with_pw_rpc.gni")'
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rpc lighting-app \
out/lighting_app_debug_rpc/BRD4161A/chip-efr32-lighting-example.out /tmp/bloat_reports/
- name: Build example EFR32 Window Covering for BRD4161A
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
# TODO ESP32 https://github.com/project-chip/connectedhomeip/issues/1510
esp32:
name: ESP32
timeout-minutes: 70
timeout-minutes: 80

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

container:
image: connectedhomeip/chip-build-esp32:0.5.48
image: connectedhomeip/chip-build-esp32:0.5.50
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -96,9 +96,6 @@ jobs:
- name: Build example Lock App
timeout-minutes: 10
run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
- name: Build example Bridge App
timeout-minutes: 10
run: scripts/examples/esp_example.sh bridge-app

- name: Uploading Size Reports
uses: actions/upload-artifact@v2
Expand All @@ -109,13 +106,13 @@ jobs:

esp32_1:
name: ESP32_1
timeout-minutes: 60
timeout-minutes: 70

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

container:
image: connectedhomeip/chip-build-esp32:0.5.48
image: connectedhomeip/chip-build-esp32:0.5.50
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand All @@ -138,6 +135,10 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Build example Bridge App
timeout-minutes: 10
run: scripts/examples/esp_example.sh bridge-app

- name: Build example Persistent Storage App
timeout-minutes: 10
run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults
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 @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-infineon:0.5.48
image: connectedhomeip/chip-build-infineon:0.5.50

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-k32w.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: connectedhomeip/chip-build-k32w:0.5.48
image: connectedhomeip/chip-build-k32w:0.5.50
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
Loading

0 comments on commit 336f454

Please sign in to comment.