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: rebase most OSS trees #8660

Merged
merged 2 commits into from
Sep 8, 2022
Merged

manifest: rebase most OSS trees #8660

merged 2 commits into from
Sep 8, 2022

Conversation

mbolivar-nordic
Copy link
Contributor

@mbolivar-nordic mbolivar-nordic commented Sep 6, 2022 •
edited
Loading

Reviewers please confirm the following planned tag names:

  • sdk-zephyr: v3.1.99-ncs1-snapshot1
  • sdk-mcuboot: v1.9.99-ncs2-snapshot1
  • sdk-mbedtls: v3.1.0-ncs1-rc1 (no snapshot since rc1 tag exists)
  • sdk-trusted-firmware-m: v1.6.0-ncs1-snapshot1

@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 Sep 6, 2022
@mbolivar-nordic mbolivar-nordic added this to the 2.1.0 milestone Sep 6, 2022
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 6, 2022 •
edited
Loading

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

Name Old Revision New Revision Diff
matter nrfconnect/sdk-connectedhomeip@b8c6fe4 nrfconnect/sdk-connectedhomeip@5faaee5 (master) nrfconnect/sdk-connectedhomeip@b8c6fe4c..5faaee50
mbedtls-nrf nrfconnect/sdk-mbedtls@v3.1.0-ncs1-rc1 nrfconnect/sdk-mbedtls@cfc8330 (development) nrfconnect/sdk-mbedtls@v3.1.0-ncs1-rc1..cfc83308
mcuboot nrfconnect/sdk-mcuboot@8b3d00a nrfconnect/sdk-mcuboot@1d535d0 (main) nrfconnect/sdk-mcuboot@8b3d00ab..1d535d0c
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@a9bbcff nrfconnect/sdk-trusted-firmware-m@4378254 (master) nrfconnect/sdk-trusted-firmware-m@a9bbcff0..43782540
zephyr nrfconnect/sdk-zephyr@3db3307 nrfconnect/sdk-zephyr@3afbbac (main) nrfconnect/sdk-zephyr@3db33071..3afbbacd

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

@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.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 6, 2022 •
edited
Loading

Integration test specification

Test Module File based changes Manually selected West overwrite
test-ci-nrfconnect-boot-fw-update X
test-fw-nrfconnect-chip X
test-fw-nrfconnect-nrf_crypto X
test-fw-nrfconnect-tfm X

test-ci-nrfconnect-boot-fw-update: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-fw-nrfconnect-nrf_crypto: added because there was no .github/test-spec.yml in 'mbedtls-nrf'
test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'

Detailed information of selected test modules

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

@Damian-Nordic
Copy link
Contributor

@mbolivar-nordic Please include Matter rebase: nrfconnect/sdk-connectedhomeip#114.

rlubos
rlubos approved these changes Sep 7, 2022
View reviewed changes
Copy link
Contributor

@rlubos rlubos left a comment

Choose a reason for hiding this comment

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

Snapshot names look correct to me.

@mbolivar-nordic
manifest: tag OSS repos prior to rebase
162b4a1 
This is regular step in the release process.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
@mbolivar-nordic
manifest: rebase OSS histories
f3fb55e 
Rewrite the history of extra patches in the nRF Connect SDK history
for OSS repositories into a linear series of commits on top of the
latest upstream merge-base.

This is a regular step in the release process.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
@mbolivar-nordic mbolivar-nordic removed the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Sep 8, 2022
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Sep 8, 2022
@mbolivar-nordic mbolivar-nordic merged commit 74761bb into nrfconnect:main Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nvlsianpu nvlsianpu nvlsianpu approved these changes

@shantha-14 shantha-14 shantha-14 approved these changes

@rlubos rlubos rlubos approved these changes

@carlescufi carlescufi Awaiting requested review from carlescufi

@tejlmand tejlmand Awaiting requested review from tejlmand

@gmarull gmarull Awaiting requested review from gmarull

Assignees
No one assigned
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-matter manifest-mbedtls-nrf manifest-mcuboot manifest-trusted-firmware-m manifest-zephyr
Projects
None yet
Milestone
2.1.0
Development

Successfully merging this pull request may close these issues.
6 participants
@mbolivar-nordic @NordicBuilder @Damian-Nordic @nvlsianpu @shantha-14 @rlubos