Skip to content

v3.0 rebase branch #2804

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 0 commits into from
Apr 24, 2025
Merged

v3.0 rebase branch #2804

merged 0 commits into from
Apr 24, 2025

Conversation

@bjarki-andreasen
Copy link
Contributor

v3.0 rebase branch

@NordicBuilder NordicBuilder mentioned this pull request Apr 23, 2025
Closed
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 23, 2025 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
babblesim_base BabbleSim/base@0cc70e7 (v1.14.2) BabbleSim/base@153101c (v1.15) BabbleSim/[email protected]
babblesim_ext_libCryptov1 BabbleSim/ext_libCryptov1@2363095 (v1.4) BabbleSim/ext_libCryptov1@da24601 (master,v1.5) BabbleSim/[email protected]
bsim zephyrproject-rtos/babblesim-manifest@1f242f4 (v2.4) zephyrproject-rtos/babblesim-manifest@a88d335 (main,v2.5) zephyrproject-rtos/[email protected]
hal_nordic zephyrproject-rtos/hal_nordic@c563b0e zephyrproject-rtos/hal_nordic@8cdcc33 zephyrproject-rtos/[email protected]
hostap zephyrproject-rtos/hostap@516cf57 zephyrproject-rtos/hostap@219b1f7 zephyrproject-rtos/[email protected]
libmetal zephyrproject-rtos/libmetal@3e8781a zephyrproject-rtos/libmetal@14f5195 (main) zephyrproject-rtos/[email protected]
nrf_hw_models zephyrproject-rtos/nrf_hw_models@71bcaa8 zephyrproject-rtos/nrf_hw_models@b84bd73 zephyrproject-rtos/[email protected]
nrf_wifi zephyrproject-rtos/nrf_wifi@0f53c9e zephyrproject-rtos/nrf_wifi@eeceee7 zephyrproject-rtos/[email protected]
open-amp zephyrproject-rtos/open-amp@52bb178 zephyrproject-rtos/open-amp@f7f4d08 (main) zephyrproject-rtos/[email protected]
openthread zephyrproject-rtos/openthread@2aeb8b8 zephyrproject-rtos/openthread@3ae741f (main) zephyrproject-rtos/[email protected]

Additional metadata changed:

Name URL Submodules West cmds module.yml
nrf_wifi ✏

⛔ DNM label due to: 1 project with metadata changes

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

@NordicBuilder NordicBuilder mentioned this pull request Apr 23, 2025
Closed
rlubos
rlubos reviewed Apr 23, 2025
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.

There are some leftover nrf-squash!/fixup! commits that should be cleaned up.
Also I see quite a few reverts in the rebased history - shouldn't they cancel out with the original commits during the rebase?

@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
8.9% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

@bjarki-andreasen bjarki-andreasen merged commit a0e545c into nrfconnect:v4.0.99-ncs1-branch Apr 24, 2025
15 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anangl anangl anangl approved these changes

@rlubos rlubos rlubos approved these changes

Assignees

No one assigned

Labels

DNM manifest manifest-babblesim_base manifest-babblesim_ext_libCryptov1 manifest-bsim manifest-hal_nordic manifest-hostap manifest-libmetal manifest-nrf_hw_models manifest-nrf_wifi manifest-open-amp manifest-openthread

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bjarki-andreasen @NordicBuilder @anangl @rlubos