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

manifest: Update sdk-zephyr to bring in the MCUboot info #12485

Merged
merged 1 commit into from
Oct 6, 2023

Conversation

de-nordic
Copy link
Contributor

Bring in the commits needed for MCUmgr to provide MCUboot info

@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 Oct 2, 2023
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 2, 2023

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

Name Old Revision New Revision Diff
mcuboot nrfconnect/sdk-mcuboot@6b106c1 nrfconnect/sdk-mcuboot@e768dd2 (main) nrfconnect/sdk-mcuboot@6b106c1f..e768dd2a
zephyr nrfconnect/sdk-zephyr@cafad74 nrfconnect/sdk-zephyr@cbe3d5f (main) nrfconnect/sdk-zephyr@cafad740..cbe3d5fb

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 2, 2023

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-ble X
test-fw-nrfconnect-ble_samples X
test-fw-nrfconnect-chip X
test-fw-nrfconnect-fem X
test-fw-nrfconnect-nrf-iot_thingy91 X
test-fw-nrfconnect-rpc X
test-fw-nrfconnect-rs X
test-fw-nrfconnect-zigbee X
test-sdk-find-my X
test-sdk-homekit X
test-sdk-sidewalk X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'

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.

@de-nordic de-nordic force-pushed the fromtree-mcuboot-info branch 2 times, most recently from 28147f7 to 018b398 Compare October 3, 2023 15:08
@de-nordic de-nordic added this to the 2.5.0 milestone Oct 4, 2023
@mkapala-nordic
Copy link
Contributor

Requires also changes from mcu-tools/mcuboot#1820

@de-nordic de-nordic force-pushed the fromtree-mcuboot-info branch 3 times, most recently from 265d7c4 to e050d18 Compare October 5, 2023 09:54
@de-nordic de-nordic force-pushed the fromtree-mcuboot-info branch 3 times, most recently from 4befaaa to bafe27c Compare October 6, 2023 09:40
Update the sdk-zephyr and sdk-mcuboot with the latest sha
from main on both repos.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
@rlubos rlubos merged commit 435544d into nrfconnect:main Oct 6, 2023
11 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-mcuboot manifest-zephyr
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants