-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
pullapprove
bot
requested review from
andy31415,
anush-apple,
austinh0,
balducci-apple,
carol-apple,
cecille,
chrisdecenzo,
chulspro,
Damian-Nordic,
franck-apple,
harimau-qirex,
hawk248,
jelderton,
jepenven-silabs,
jmartinez-silabs,
kpschoedel,
LuDuda,
mrjerryjohns,
msandstedt,
mspang,
pan-apple,
robszewczyk,
sagar-apple,
saurabhst,
vivien-apple,
wbschiller,
woody-apple,
yufengwangca and
yunhanw-google
October 22, 2021 17:14
kpschoedel
approved these changes
Oct 22, 2021
woody-apple
approved these changes
Oct 22, 2021
jmartinez-silabs
approved these changes
Oct 22, 2021
saurabhst
approved these changes
Oct 22, 2021
du48s03
approved these changes
Oct 22, 2021
PR #10858: Size comparison from 3f984d7 to 4113ed7 27 builds (for efr32, esp32, k32w, mbed, nrfconnect, p6, qpg, telink)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#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.