Skip to content

squash! [nrf noup] action: clang: set the name of checkout repo to zephyr #695

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

Jump to bottom
Merged
merged 1 commit into from
Jan 26, 2022
Merged

squash! [nrf noup] action: clang: set the name of checkout repo to zephyr #695

merged 1 commit into from
Jan 26, 2022

Conversation

@PerMac
Copy link
Contributor

@PerMac PerMac commented Jan 26, 2022

A similar fix to #686. West update cannot import submanifests
because the repo is checked out as "sdk-zephyr". This patch set
the checkout dir to "zephyr"

Signed-off-by: Maciej Perkowski [email protected]

@PerMac
Copy link
Contributor Author

PerMac commented Jan 26, 2022

I run some quick test for this. I forked sdk-zephyr repo and merged this PR there. Then I opened a PR with a lousy commit msg. It seems that the updated compliance worked correctly, catching the error and making the PR to fail: PerMac#4

@carlescufi
Copy link
Contributor

Please use the squash! terminology here to let future rebasers know that this needs to be squashed in the future.

@github-actions github-actions bot mentioned this pull request Jan 26, 2022
Closed
carlescufi
carlescufi requested changes Jan 26, 2022
View reviewed changes
Copy link
Contributor

@carlescufi carlescufi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not understand why this is failing now.

@PerMac
Copy link
Contributor Author

PerMac commented Jan 26, 2022

I think some regression leak in with the upmerge causing build errors:
Execution / SanityCheckNRF gnuarmemb 5/8 / Sanity Check / nrf52dk_nrf52832:tests/drivers/build_all/modem/drivers.modem.tests/drivers/build_all/modem/drivers.modem.build
Execution / SanityCheckNRF gnuarmemb 7/8 / Sanity Check / nrf9160dk_nrf9160_ns:samples/tfm_integration/tfm_secure_partition/sample.tfm.samples/tfm_integration/tfm_secure_partition/sample.tfm.secure_partition
Execution / SanityCheckNRF gnuarmemb 7/8 / Sanity Check / nrf9160dk_nrf9160_ns:samples/tfm_integration/tfm_secure_partition/sample.tfm.samples/tfm_integration/tfm_secure_partition/sample.tfm.secure_partition.ipc

@PerMac
Copy link
Contributor Author

PerMac commented Jan 26, 2022

@carlescufi Sorry, I don't know what are you asking for. Can you point me to some explanation of "squash! terminology"?

@PerMac PerMac force-pushed the fix/compliance_action branch from 591572f to c49b838 Compare January 26, 2022 15:19
@PerMac PerMac changed the title [nrf noup] fix: Set explicite location of zephyr for compliance action squash! [nrf noup] action: clang: set the name of checkout repo to zephyr Jan 26, 2022
@PerMac
Copy link
Contributor Author

PerMac commented Jan 26, 2022

@carlescufi I amended the commit and the PR titles. Is that what you meant?

@carlescufi
Copy link
Contributor

You are missing the actual new commit line:

[nrf noup] action: compliance: set checkout folder name to zephyr
 
squash! [nrf noup] action: clang: set the name of checkout repo to zephyr

@PerMac
[nrf noup] action: compliance: set checkout folder name to zephyr
d0fa353 
squash! [nrf noup] action: clang: set the name of checkout repo to zephyr

A similar fix to nrfconnect#686. West update cannot import submanifests
because the repo is checked out as "sdk-zephyr". This patch set
the checkout dir to "zephyr"

Signed-off-by: Maciej Perkowski <[email protected]>
@PerMac PerMac force-pushed the fix/compliance_action branch from c49b838 to d0fa353 Compare January 26, 2022 15:40
@carlescufi carlescufi merged commit 236a25e into nrfconnect:main Jan 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@carlescufi carlescufi carlescufi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@PerMac @carlescufi