Skip to content

Fix nanopb code generation#32687

Merged
andy31415 merged 1 commit intoproject-chip:masterfrom
andy31415:fix_proto_compile
Mar 22, 2024
Merged

Fix nanopb code generation#32687
andy31415 merged 1 commit intoproject-chip:masterfrom
andy31415:fix_proto_compile

Conversation

@andy31415
Copy link
Copy Markdown
Contributor

@andy31415 andy31415 commented Mar 22, 2024

googleapis/python-api-core#626 in the latest google-api-core pulls in proto-plus as a dependency and this breaks nanopb (due to conflicts in naming the proto crate.

Ideally we would have had fixed dependencies on all crates and I am unsure how we end up with an incomplete constraints.txt, however for now specifically only fixing this failure.

There may be more as we seem not to fix all crates we use (which is especially hard given that we may have different packages installed for different platforms)

@andy31415 andy31415 added the hotfix urgent fix needed, can bypass review label Mar 22, 2024
@andy31415 andy31415 merged commit 1061ff3 into project-chip:master Mar 22, 2024
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Mar 22, 2024 •
edited
Loading

PR #32687: Size comparison from 049c529 to 4595102

Full report (41 builds for cc13x4_26x4, cc32xx, cyw30739, k32w, nrfconnect, psoc6, qpg, stm32, telink)
platform target config section 049c529 4595102 change % change
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 (read only) 774332 774332 0 0.0
(read/write) 168640 168640 0 0.0
.bss 90628 90628 0 0.0
.data 3568 3568 0 0.0
.rodata 81852 81852 0 0.0
.text 692212 692212 0 0.0
lock-ftd LP_EM_CC1354P10_6 (read only) 790748 790748 0 0.0
(read/write) 178888 178888 0 0.0
.bss 100876 100876 0 0.0
.data 3568 3568 0 0.0
.rodata 76028 76028 0 0.0
.text 714452 714452 0 0.0
lock-mtd LP_EM_CC1354P10_6 (read only) 779396 779396 0 0.0
(read/write) 173328 173328 0 0.0
.bss 95316 95316 0 0.0
.data 3568 3568 0 0.0
.rodata 102788 102788 0 0.0
.text 676340 676340 0 0.0
pump-app LP_EM_CC1354P10_6 (read only) 731668 731668 0 0.0
(read/write) 167608 167608 0 0.0
.bss 89360 89360 0 0.0
.data 3560 3560 0 0.0
.rodata 77516 77516 0 0.0
.text 653884 653884 0 0.0
pump-controller-app LP_EM_CC1354P10_6 (read only) 717180 717180 0 0.0
(read/write) 167816 167816 0 0.0
.bss 89584 89584 0 0.0
.data 3552 3552 0 0.0
.rodata 73292 73292 0 0.0
.text 643620 643620 0 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL (read only) 583818 583818 0 0.0
(read/write) 208000 208000 0 0.0
.bss 201228 201228 0 0.0
.data 1648 1648 0 0.0
.rodata 86666 86666 0 0.0
.text 495032 495032 0 0.0
lock CC3235SF_LAUNCHXL (read only) 629090 629090 0 0.0
(read/write) 208344 208344 0 0.0
.bss 201720 201720 0 0.0
.data 1504 1504 0 0.0
.rodata 107122 107122 0 0.0
.text 519848 519848 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 569483 569483 0 0.0
.app_xip_area 459229 459229 0 0.0
.bss 65080 65080 0 0.0
.data 752 752 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 552139 552139 0 0.0
.app_xip_area 437125 437125 0 0.0
.bss 69832 69832 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 572267 572267 0 0.0
.app_xip_area 463517 463517 0 0.0
.bss 63616 63616 0 0.0
.data 712 712 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
switch cyw930739m2evb_01 (read/write) 565195 565195 0 0.0
.app_xip_area 453165 453165 0 0.0
.bss 66816 66816 0 0.0
.data 792 792 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
k32w contact k32w0+release (read only) 605184 605184 0 0.0
(read/write) 79472 79472 0 0.0
.bss 67300 67300 0 0.0
.data 2188 2188 0 0.0
.text 604648 604648 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 700044 700044 0 0.0
.bss 71148 71148 0 0.0
.data 2856 2856 0 0.0
.text 586656 586656 0 0.0
light k32w0+release (read only) 607144 607144 0 0.0
(read/write) 79332 79332 0 0.0
.bss 67156 67156 0 0.0
.data 2192 2192 0 0.0
.text 606608 606608 0 0.0
k32w1+release (read only) 1024 1024 0 0.0
(read/write) 791480 791480 0 0.0
.bss 80628 80628 0 0.0
.data 2056 2056 0 0.0
.text 669432 669432 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1062772 1062772 0 0.0
bss 133111 133111 0 0.0
rodata 102612 102612 0 0.0
text 779828 779828 0 0.0
nrf7002dk_nrf5340_cpuapp (read only) 4 4 0 0.0
(read/write) 1224196 1224196 0 0.0
bss 127147 127147 0 0.0
rodata 151200 151200 0 0.0
text 795824 795824 0 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read only) 4 4 0 0.0
(read/write) 1010348 1010348 0 0.0
bss 131969 131969 0 0.0
rodata 89876 89876 0 0.0
text 741164 741164 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 834424 834424 0 0.0
(read/write) 1797284 1797284 0 0.0
.bss 196236 196236 0 0.0
.data 2680 2680 0 0.0
.text 1589980 1589980 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 837576 837576 0 0.0
(read/write) 1719324 1719324 0 0.0
.bss 193116 193116 0 0.0
.data 2648 2648 0 0.0
.text 1515172 1515172 0 0.0
light cy8ckit_062s2_43012 (read only) 844304 844304 0 0.0
(read/write) 1638444 1638444 0 0.0
.bss 186580 186580 0 0.0
.data 2456 2456 0 0.0
.text 1441020 1441020 0 0.0
lock cy8ckit_062s2_43012 (read only) 817144 817144 0 0.0
(read/write) 1668100 1668100 0 0.0
.bss 213740 213740 0 0.0
.data 2456 2456 0 0.0
.text 1443516 1443516 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1130296 1130296 0 0.0
.bss 102480 102480 0 0.0
.data 836 836 0 0.0
.text 642680 642680 0 0.0
lock-app qpg6105+debug (read/write) 1090272 1090272 0 0.0
.bss 97224 97224 0 0.0
.data 856 856 0 0.0
.text 602652 602652 0 0.0
stm32 light STM32WB5MM-DK (read/write) 601509 601509 0 0.0
.bss 128344 128344 0 0.0
.data 676 676 0 0.0
.rodata 79732 79732 0 0.0
.text 383024 383024 0 0.0
telink air-quality-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 824278 824278 0 0.0
bss 49684 49684 0 0.0
text 617038 617038 0 0.0
all-clusters-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 1093132 1093132 0 0.0
bss 101804 101804 0 0.0
text 794152 794152 0 0.0
all-clusters-minimal-app tlsr9528a (read only) 47960 47960 0 0.0
(read/write) 1050604 1050604 0 0.0
bss 110108 110108 0 0.0
text 765474 765474 0 0.0
bridge-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 911316 911316 0 0.0
bss 93140 93140 0 0.0
text 652950 652950 0 0.0
contact-sensor-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 825910 825910 0 0.0
bss 49732 49732 0 0.0
text 618728 618728 0 0.0
light-switch-app-ota-shell-factory-data tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 931628 931628 0 0.0
bss 77732 77732 0 0.0
text 698878 698878 0 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d (read only) 29122 29122 0 0.0
(read/write) 1074488 1074488 0 0.0
bss 100220 100220 0 0.0
text 778334 778334 0 0.0
lock-app-dfu tlsr9528a (read only) 51584 51584 0 0.0
(read/write) 904020 904020 0 0.0
bss 69196 69196 0 0.0
text 654142 654142 0 0.0
ota-requestor-app tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 930288 930288 0 0.0
bss 92720 92720 0 0.0
text 672028 672028 0 0.0
pump-app tlsr9258a_retention (read only) 51774 51774 0 0.0
(read/write) 828642 828642 0 0.0
bss 49840 49840 0 0.0
text 621790 621790 0 0.0
pump-controller-app tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 792208 792208 0 0.0
bss 56040 56040 0 0.0
text 592468 592468 0 0.0
shell tlsr9518adk80d (read only) 29042 29042 0 0.0
(read/write) 677312 677312 0 0.0
bss 73672 73672 0 0.0
text 462570 462570 0 0.0
smoke_co_alarm-app tlsr9528a_retention (read only) 51774 51774 0 0.0
(read/write) 833446 833446 0 0.0
bss 51364 51364 0 0.0
text 625098 625098 0 0.0
temperature-measurement-app-mars-ota tlsr9518adk80d (read only) 32220 32220 0 0.0
(read/write) 852177 852177 0 0.0
bss 59516 59516 0 0.0
text 637178 637178 0 0.0
thermostat tlsr9518adk80d (read only) 31872 31872 0 0.0
(read/write) 817864 817864 0 0.0
bss 56328 56328 0 0.0
text 612152 612152 0 0.0
window-covering tlsr9258a (read only) 51584 51584 0 0.0
(read/write) 835956 835956 0 0.0
bss 68104 68104 0 0.0
text 627410 627410 0 0.0

cecille pushed a commit to cecille/connectedhomeip that referenced this pull request Apr 12, 2024
@andy31415 @cecille
Fix google-api-core (project-chip#32687)
860b262
andy31415 added a commit that referenced this pull request Apr 12, 2024
@cecille @andy31415
Fix google-api-core (#32687) (#32965)
8ca3da7 
Co-authored-by: Andrei Litvin <andy314@gmail.com>
andy31415 added a commit to andy31415/connectedhomeip that referenced this pull request Apr 23, 2024
@andy31415 @andreilitvin
Fix google-api-core (project-chip#32687)
1e561a9
@andy31415 andy31415 mentioned this pull request Apr 23, 2024
Merged
andy31415 added a commit to andy31415/connectedhomeip that referenced this pull request May 3, 2024
@andy31415 @andreilitvin
Fix google-api-core (project-chip#32687)
131f391
@andy31415 andy31415 mentioned this pull request May 3, 2024
Merged
andy31415 added a commit that referenced this pull request May 3, 2024
@andy31415 @shubhamdp @andreilitvin
Compile fixes for CI for v1.1-branch (#33293)
651298b 
* Fix builds to macos-13 rather than latest due to bootstrap python incompatibilities (#33142)

* Fix google-api-core (#32687)

* [ESP32] bump the component manager version (#32474)

* [ESP32] bump the component manager version

* Update requirements.esp32.txt

* Update requirements.esp32.txt

* fix the version in constraints.txt

* Bump prompt-toolkit requirement to fix ptpython version update (#30987)

* Undo protobuf constraint fixing - make requirements and constraints equal

---------

Co-authored-by: Shubham Patil <shubham.patil@espressif.com>
Co-authored-by: Andrei Litvin <andreilitvin@google.com>
@andy31415 andy31415 mentioned this pull request Oct 24, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

hotfix urgent fix needed, can bypass review request sve scripts sve cherry pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@andy31415