Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick - Chef CD, sample apps, esp32 rpc fix, to interop branch #19979

Merged
merged 13 commits into from
Jun 27, 2022
Merged

Cherry pick - Chef CD, sample apps, esp32 rpc fix, to interop branch #19979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
157cc9a
Pigweed: Update to 67bc89cdda8c (#19560)
Jun 15, 2022
ee777df
Fix esp32 wifi and add RPC support on linux (#19260)
cpagravel Jun 16, 2022
39f6090
Support to return software_version_string with <branch>:<commit_id> o…
MtTsai Jun 17, 2022
f5fd0dd
Chef - Add 13 sample apps (#19663)
cpagravel Jun 18, 2022
0269bb3
Revert "Support to return software_version_string with <branch>:<comm…
mspang Jun 21, 2022
33cde87
Truncate the branch info of the software version string while the tot…
MtTsai Jun 22, 2022
8c5435d
Make Chef CI use existing zzz_generated and complete Chef CD for exis…
aBozowski Jun 23, 2022
2811140
Chef - Fix broken esp32 RPC build caused by #18621 (#19876)
cpagravel Jun 23, 2022
68095a5
Make Scenes name support dependent on FeatureMap attribute (#18667)
jepenven-silabs May 22, 2022
a847031
Rebuild Zap generated files
cpagravel Jun 25, 2022
62ab2ae
Fix CI for ipv6only/esp32 example build
cpagravel Jun 26, 2022
bdbefce
Fix errors regarding ownership of repo. (Taken from #18302)
cpagravel Jun 25, 2022
d154488
Bump chef.yaml platform containers to 0.5.75
cpagravel Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 3 additions & 28 deletions .github/workflows/chef.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,13 @@ concurrency:

jobs:

validate_zzz:
name: Chef - Validate cached ZAP output
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'
container:
image: connectedhomeip/chip-build:0.5.64
options: --user root
steps:
- uses: Wandalen/[email protected]
name: Checkout
with:
action: actions/checkout@v3
with: |
token: ${{ github.token }}
attempt_limit: 3
attempt_delay: 2000
- name: Chef validate zzz
shell: bash
run: |
cd examples/chef
python3 chef.py --validate_zzz

chef_linux:
name: Chef - Linux CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.64
image: connectedhomeip/chip-build:0.5.75
options: --user root

steps:
Expand All @@ -72,12 +49,11 @@ jobs:

chef_esp32:
name: Chef - ESP32 CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.5.64
image: connectedhomeip/chip-build-esp32:0.5.75
options: --user root

steps:
Expand All @@ -96,12 +72,11 @@ jobs:

chef_nrfconnect:
name: Chef - NRFConnect CI Examples
needs: validate_zzz
runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.5.64
image: connectedhomeip/chip-build-nrf-platform:0.5.75
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion config/ameba/chip.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ if (matter_enable_rpc)
#string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n")
string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"\n")
string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n")
string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba\"\n")
string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n")
string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n")
Expand Down
2 changes: 1 addition & 1 deletion config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/bl602/pw_sys_io:pw_sys_io_bl602"

Expand Down
2 changes: 1 addition & 1 deletion config/efr32/lib/pw_rpc/pw_rpc.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32"

Expand Down
4 changes: 2 additions & 2 deletions config/esp32/components/chip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ endif()

if(CONFIG_ENABLE_PW_RPC)
string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]")
chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:toolchain_cpp_standard\"]")
chip_gn_arg_append("chip_build_pw_rpc_lib" "true")
chip_gn_arg_append("chip_build_pw_trace_lib" "true")
chip_gn_arg_append("pw_log_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"")
chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"")
chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"")
chip_gn_arg_append("pw_sys_io_BACKEND" "\"//third_party/connectedhomeip/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32\"")
chip_gn_arg_append("pw_trace_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_trace_tokenized\"")
chip_gn_arg_append("dir_pw_third_party_nanopb" "\"//third_party/connectedhomeip/third_party/nanopb/repo\"")
Expand Down
3 changes: 2 additions & 1 deletion config/mbed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,9 @@ target_include_directories(${APP_TARGET} PRIVATE
${PIGWEED_ROOT}/pw_sys_io/public
${PIGWEED_ROOT}/pw_assert/public
${PIGWEED_ROOT}/pw_assert/assert_lite_public_overrides
${PIGWEED_ROOT}/pw_assert_log/assert_backend_public_overrides
${PIGWEED_ROOT}/pw_assert_log/check_backend_public_overrides
${PIGWEED_ROOT}/pw_assert_log/public
${PIGWEED_ROOT}/pw_assert_log/public_overrides
${PIGWEED_ROOT}/pw_bytes/public
${PIGWEED_ROOT}/pw_checksum/public
${PIGWEED_ROOT}/pw_containers/public
Expand Down
2 changes: 1 addition & 1 deletion config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_sys_io_BACKEND =
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed"
pw_rpc_system_server_BACKEND =
Expand Down
2 changes: 1 addition & 1 deletion config/nrfconnect/chip-module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ if (CONFIG_CHIP_PW_RPC)
set(PIGWEED_DIR "//third_party/pigweed/repo")
chip_gn_arg_bool("chip_build_pw_trace_lib" "true")
chip_gn_arg_string("pw_trace_BACKEND" ${PIGWEED_DIR}/pw_trace_tokenized)
chip_gn_arg_string("pw_assert_BACKEND" ${PIGWEED_DIR}/pw_assert_log)
chip_gn_arg_string("pw_assert_BACKEND" ${PIGWEED_DIR}/pw_assert_log:check_backend)
chip_gn_arg_string("pw_log_BACKEND" ${PIGWEED_DIR}/pw_log_basic)
chip_gn_arg("pw_build_LINK_DEPS" [\"${PIGWEED_DIR}/pw_assert:impl\",\ \"${PIGWEED_DIR}/pw_log:impl\"])
endif()
Expand Down
2 changes: 1 addition & 1 deletion config/qpg/lib/pw_rpc/pw_rpc.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni")
import("//build_overrides/pigweed.gni")

pw_log_BACKEND = "$dir_pw_log_basic"
pw_assert_BACKEND = "$dir_pw_assert_log"
pw_assert_BACKEND = "$dir_pw_assert_log:check_backend"
pw_sys_io_BACKEND = "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg"

pw_build_LINK_DEPS = [
Expand Down
15 changes: 8 additions & 7 deletions examples/all-clusters-app/ameba/chip_main.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING

pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
pw_set_backend(pw_log pw_log_basic)
pw_set_backend(pw_assert pw_assert_log)
pw_set_backend(pw_assert.check pw_assert_log.check_backend)
pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
pw_set_backend(pw_sys_io pw_sys_io.ameba)
pw_set_backend(pw_trace pw_trace_tokenized)

Expand All @@ -36,7 +37,7 @@ pw_proto_library(attributes_service
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(button_service
Expand All @@ -47,7 +48,7 @@ pw_proto_library(button_service
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(device_service
Expand All @@ -60,7 +61,7 @@ pw_proto_library(device_service
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(lighting_service
Expand All @@ -71,7 +72,7 @@ pw_proto_library(lighting_service
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(locking_service
Expand All @@ -82,7 +83,7 @@ pw_proto_library(locking_service
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(wifi_service
Expand All @@ -93,7 +94,7 @@ pw_proto_library(wifi_service
PREFIX
wifi_service
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
STRIP_PREFIX
${chip_dir}/examples/common/pigweed/protos
)
Expand Down
3 changes: 2 additions & 1 deletion examples/all-clusters-app/esp32/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cm
pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)

pw_set_backend(pw_log pw_log_basic)
pw_set_backend(pw_assert pw_assert_log)
pw_set_backend(pw_assert.check pw_assert_log.check_backend)
pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
pw_set_backend(pw_sys_io pw_sys_io.esp32)
pw_set_backend(pw_trace pw_trace_tokenized)

Expand Down
14 changes: 7 additions & 7 deletions examples/all-clusters-app/esp32/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pw_proto_library(attributes_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(button_service
Expand All @@ -162,7 +162,7 @@ pw_proto_library(button_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(descriptor_service
Expand All @@ -173,7 +173,7 @@ pw_proto_library(descriptor_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(device_service
Expand All @@ -186,7 +186,7 @@ pw_proto_library(device_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(lighting_service
Expand All @@ -197,7 +197,7 @@ pw_proto_library(lighting_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(locking_service
Expand All @@ -208,7 +208,7 @@ pw_proto_library(locking_service
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
)

pw_proto_library(wifi_service
Expand All @@ -219,7 +219,7 @@ pw_proto_library(wifi_service
PREFIX
wifi_service
DEPS
pw_protobuf.common_protos
pw_protobuf.common_proto
STRIP_PREFIX
${CHIP_ROOT}/examples/common/pigweed/protos
)
Expand Down
Loading