Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions scripts/quarantine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,24 +140,6 @@
- [email protected]/nrf54h20/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35605"

- scenarios:
- applications.nrf_desktop.*
platforms:
- nrf52kbd/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.mesh.light_ctrl
platforms:
- nrf52dk/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.nrf_dm.timeslot
platforms:
- nrf52dk/nrf52832
comment: "Needs alignment to new errata system in nrfx - NRFX-8421"

- scenarios:
- sample.bluetooth.mesh.light_ctrl.emds
platforms:
Expand Down
9 changes: 9 additions & 0 deletions scripts/quarantine_zephyr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
- scenarios:
- kernel.common.misra
platforms:
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35491"

Expand Down Expand Up @@ -578,3 +579,11 @@
- scenarios:
- buildsystem.sbom.spdx
comment: "Missing toolchain python package. https://nordicsemi.atlassian.net/browse/NCSDK-35387"

- scenarios:
- arch.arm.*.no_optimizations
- llext.writable
- llext.writable_slid_linking
- llext.writable_relocatable_slid_linking
- llext.writable_relocatable
comment: "https://nordicsemi.atlassian.net/browse/NRFX-8497"
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: c475e9f2c9eedd5aef47e2e0a36eb02d05e87a7f
revision: 3acc99b2018b0ace7a8b2922006cb2ffbd17b9d1
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading