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.

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

Fix build failure due to merge conflict. #10858

Merged
merged 1 commit into from
Oct 22, 2021

Conversation

bzbarsky-apple
Copy link
Contributor

#10821 changed the
code we generate for tests and in parallel
#10826 added a new
test that did not get generated with the new setup.

Problem

Build broken.

Change overview

Regenerate to fix.

Testing

Compiled locally.

project-chip#10821 changed the
code we generate for tests and in parallel
project-chip#10826 added a new
test that did not get generated with the new setup.
@bzbarsky-apple bzbarsky-apple added the hotfix urgent fix needed, can bypass review label Oct 22, 2021
@woody-apple woody-apple merged commit 640e204 into project-chip:master Oct 22, 2021
@bzbarsky-apple bzbarsky-apple deleted the fix-build branch October 22, 2021 17:45
@github-actions
Copy link

PR #10858: Size comparison from 3f984d7 to 4113ed7

27 builds (for efr32, esp32, k32w, mbed, nrfconnect, p6, qpg, telink)
platform target config section 3f984d7 4113ed7 change % change
efr32 lighting-app BRD4161A .bss 118036 118036 0 0.0
.data 1800 1800 0 0.0
.text 784296 784296 0 0.0
lock-app BRD4161A .bss 115884 115884 0 0.0
.data 1760 1760 0 0.0
.text 763440 763440 0 0.0
window-app BRD4161A .bss 116204 116204 0 0.0
.data 1764 1764 0 0.0
.text 764356 764356 0 0.0
lighting-app BRD4161A+rpc .bss 131364 131364 0 0.0
.data 1852 1852 0 0.0
.text 764012 764012 0 0.0
esp32 all-clusters-app c3devkit .dram0.bss 60296 60296 0 0.0
.dram0.data 16440 16440 0 0.0
.flash.rodata 199864 199864 0 0.0
.flash.text 874306 874306 0 0.0
.iram0.text 57564 57564 0 0.0
m5stack .dram0.bss 62808 62808 0 0.0
.dram0.data 32084 32084 0 0.0
.flash.rodata 208600 208600 0 0.0
.flash.text 905227 905227 0 0.0
.iram0.text 125115 125115 0 0.0
k32w lock-app k32w061+debug .bss 69068 69068 0 0.0
.data 1864 1864 0 0.0
.text 516024 516024 0 0.0
shell k32w061+debug .bss 55080 55080 0 0.0
.data 672 672 0 0.0
.text 359480 359480 0 0.0
lighting-app k32w061+se05x+release .bss 78592 78592 0 0.0
.data 1900 1900 0 0.0
.text 614788 614788 0 0.0
mbed lighting-app CY8CPROTO_062_4343W+release .bss 172100 172100 0 0.0
.data 5464 5464 0 0.0
.heap 858880 858880 0 0.0
.text 1220088 1220088 0 0.0
lock-app CY8CPROTO_062_4343W+release .bss 171020 171020 0 0.0
.data 5432 5432 0 0.0
.heap 859992 859992 0 0.0
.text 1197992 1197992 0 0.0
pigweed-app CY8CPROTO_062_4343W+release .bss 11760 11760 0 0.0
.data 4360 4360 0 0.0
.heap 1020328 1020328 0 0.0
.text 103064 103064 0 0.0
nrfconnect lighting-app nrf52840dk_nrf52840 bss 113180 113180 0 0.0
rodata 98080 98080 0 0.0
text 577104 577104 0 0.0
lock-app nrf52840dk_nrf52840 bss 112244 112244 0 0.0
rodata 94416 94416 0 0.0
text 558592 558592 0 0.0
pigweed-app nrf52840dk_nrf52840 bss 51824 51824 0 0.0
rodata 45776 45776 0 0.0
text 339456 339456 0 0.0
pump-app nrf52840dk_nrf52840 bss 112316 112316 0 0.0
rodata 95396 95396 0 0.0
text 561744 561744 0 0.0
pump-controller-app nrf52840dk_nrf52840 bss 112252 112252 0 0.0
rodata 94476 94476 0 0.0
text 558384 558384 0 0.0
shell nrf52840dk_nrf52840 bss 109072 109072 0 0.0
rodata 72524 72524 0 0.0
text 520208 520208 0 0.0
lighting-app nrf52840dk_nrf52840+rpc bss 109420 109420 0 0.0
rodata 88856 88856 0 0.0
text 550296 550296 0 0.0
nrf5340dk_nrf5340_cpuapp bss 114552 114552 0 0.0
rodata 93320 93320 0 0.0
text 506572 506572 0 0.0
lock-app nrf5340dk_nrf5340_cpuapp bss 113620 113620 0 0.0
rodata 89676 89676 0 0.0
text 488056 488056 0 0.0
shell nrf5340dk_nrf5340_cpuapp bss 110056 110056 0 0.0
rodata 67168 67168 0 0.0
text 440816 440816 0 0.0
p6 lock-app default .bss 68216 68216 0 0.0
.data 2416 2416 0 0.0
.heap 962712 962712 0 0.0
.text 1126688 1126688 0 0.0
qpg lighting-app qpg6100+debug .bss 53464 53464 0 0.0
.data 1004 1004 0 0.0
.text 486036 486036 0 0.0
lock-app qpg6100+debug .bss 52408 52408 0 0.0
.data 960 960 0 0.0
.text 462120 462120 0 0.0
persistent-storage-app qpg6100+debug .bss 27752 27752 0 0.0
.data 372 372 0 0.0
.text 149896 149896 0 0.0
telink lighting-app tlsr9518adk80d bss 71000 71000 0 0.0
noinit 33216 33216 0 0.0
text 457612 457612 0 0.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotfix urgent fix needed, can bypass review review - pending
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants