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

Jump to bottom

manifest: sdk-zephyr: Update nrf hw model revision #12082

Merged
merged 1 commit into from
Aug 22, 2023
Merged

manifest: sdk-zephyr: Update nrf hw model revision #12082

merged 1 commit into from
Aug 22, 2023

Conversation

ilhanates
Copy link
Contributor

sdk-zephyr revision is updated to point latest nrf_hw_models

@github-actions github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest labels Aug 21, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 21, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@0db8061 nrfconnect/sdk-zephyr@2119df3 (main) nrfconnect/sdk-zephyr@0db80614..2119df30

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Aug 21, 2023 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nfc X
test-fw-nrfconnect-nrf-iot_lwm2m X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-tfm X
test-fw-nrfconnect-thread X
test-sdk-find-my X

Detailed information of selected test modules

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@ilhanates
Copy link
Contributor Author

Tests fail due to compilation issues possibly related to a previous zephyr commit @ankuns Do you have any idea to fix this?

https://jenkins-ncs.nordicsemi.no/blue/organizations/jenkins/latest%2Fsdk-nrf/detail/PR-12082/3/pipeline
[2023-08-21T14:44:44.909Z] ../../../../../nrf/samples/peripheral/802154_phy_test/src/rf_proc.c:286:6: error: conflicting types for 'nrf_802154_energy_detected'; have 'void(uint8_t)' {aka 'void(unsigned char)'} [2023-08-21T14:44:44.909Z] 286 | void nrf_802154_energy_detected(uint8_t result) [2023-08-21T14:44:44.909Z] | ^~~~~~~~~~~~~~~~~~~~~~~~~~ [2023-08-21T14:44:44.909Z] In file included from ../../../../../nrfxlib/nrf_802154/common/include/nrf_802154.h:47, [2023-08-21T14:44:44.909Z] from ../../../../../nrf/samples/peripheral/802154_phy_test/src/rf_proc.c:24: [2023-08-21T14:44:44.909Z] ../../../../../nrfxlib/nrf_802154/common/include/nrf_802154_callouts.h:77:13: note: previous declaration of 'nrf_802154_energy_detected' with type 'void(const nrf_802154_energy_detected_t *)' [2023-08-21T14:44:44.909Z] 77 | extern void nrf_802154_energy_detected(const nrf_802154_energy_detected_t * p_result); [2023-08-21T14:44:44.909Z] | ^~~~~~~~~~~~~~~~~~~~~~~~~~ [2023-08-21T14:44:44.909Z] [19/295] Building C object CMakeFiles/app.dir/src/ptt_conf.c.obj

@ankuns
Copy link
Contributor

ankuns commented Aug 22, 2023 •
edited
Loading

This PR must be merged first first #11767
Edit: above PR is merged, please rebase and try again

rlubos
rlubos reviewed Aug 22, 2023
View reviewed changes
west.yml Outdated
@@ -59,7 +59,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 9e7d6bbdf82f8d1fa17c1dc82c6a868554000025
revision: pull/1284/head
Copy link
Contributor

@rlubos rlubos Aug 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Please update SHA: 2119df306f5c9104d479f96c4c8af00857094f83

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@NordicBuilder NordicBuilder removed the DNM label Aug 22, 2023
@ilhanates
manifest: sdk-zephyr: Update nrf hw model revision
7bee432 
sdk-zephyr revision is updated to point latest nrf_hw_models

Signed-off-by: Ilhan Ates <ilhan.ates@nordicsemi.no>
@rlubos rlubos merged commit 640348d into nrfconnect:main Aug 22, 2023
24 checks passed
@ilhanates ilhanates deleted the update_hw_models_to_latest branch August 23, 2023 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rlubos rlubos rlubos approved these changes

@laxiLang laxiLang laxiLang approved these changes

@carlescufi carlescufi Awaiting requested review from carlescufi

@tejlmand tejlmand Awaiting requested review from tejlmand

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-zephyr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ilhanates @NordicBuilder @ankuns @laxiLang @rlubos