Skip to content

Conversation

@HaavardRei
Copy link
Contributor

  • Adds an empty bt_mesh_rpl_pending_store_all_nodes function to rpl.c to avoid compilation errors when EMDS is enabled.
  • Updates sdk-zephyr manifest

@HaavardRei HaavardRei requested review from a team as code owners October 22, 2024 06:30
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. labels Oct 22, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 22, 2024

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

Name Old Revision New Revision Diff
zephyr nrfconnect/sdk-zephyr@be00e5a nrfconnect/sdk-zephyr@e516ad3 (main) nrfconnect/[email protected]

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 22, 2024

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 6

Inputs:

Sources:

sdk-nrf: PR head: a8f4651da71a6813cb3ccd72c55c44b809c2bfbf
zephyr: PR head: e516ad354c34483e8050871fd7c915c72bc2f4fd

more details

sdk-nrf:

PR head: a8f4651da71a6813cb3ccd72c55c44b809c2bfbf
merge base: b40284b8e5094fa862f500326e33f28760325e0e
target head (main): d26acd57a91cc9b6c329dc6cb8c9ee208f9a7728
Diff

zephyr:

PR head: e516ad354c34483e8050871fd7c915c72bc2f4fd
merge base: be00e5a236d2cd71583a36e4c93cb3400a2faff0
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (21)
subsys
│  ├── bluetooth
│  │  ├── mesh
│  │  │  │ rpl.c
west.yml
zephyr
│  ├── doc
│  │  ├── connectivity
│  │  │  ├── bluetooth
│  │  │  │  ├── api
│  │  │  │  │  ├── mesh
│  │  │  │  │  │  │ brg_cfg.rst
│  ├── include
│  │  ├── zephyr
│  │  │  ├── bluetooth
│  │  │  │  ├── mesh
│  │  │  │  │  ├── brg_cfg.h
│  │  │  │  │  │ brg_cfg_cli.h
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── mesh
│  │  │  │  ├── adv_ext.c
│  │  │  │  ├── brg_cfg.c
│  │  │  │  ├── brg_cfg.h
│  │  │  │  ├── brg_cfg_cli.c
│  │  │  │  ├── brg_cfg_srv.c
│  │  │  │  ├── dfd_srv.c
│  │  │  │  ├── rpl.c
│  │  │  │  ├── rpl.h
│  │  │  │  ├── settings.c
│  │  │  │  ├── shell
│  │  │  │  │  │ brg_cfg.c
│  ├── tests
│  │  ├── bluetooth
│  │  │  ├── mesh
│  │  │  │  ├── brg
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  │  │  ├── tester
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  ├── overlay-mesh.conf
│  │  │  │  ├── src
│  │  │  │  │  │ btp_mesh.c
│  │  ├── bsim
│  │  │  ├── bluetooth
│  │  │  │  ├── mesh
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ test_brg.c

Outputs:

Toolchain

Version: 3dd8985b56
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:3dd8985b56_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 5
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-ble_mesh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-sdk-audio
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi

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.

@HaavardRei HaavardRei force-pushed the mesh_cherry_pick_2_8 branch from 3c10194 to bb24cd5 Compare October 23, 2024 07:38
Adds an empty function `bt_mesh_rpl_pending_store_all_nodes` to rpl.c,
corresponding to the function declared in zephyr. This is done to avoid
compilation errors when building the mesh stack with the EMDS enabled.

Signed-off-by: Håvard Reierstad <[email protected]>
Updates sdk-zephyr revision.

Signed-off-by: Håvard Reierstad <[email protected]>
@rlubos rlubos force-pushed the mesh_cherry_pick_2_8 branch from bb24cd5 to a8f4651 Compare October 23, 2024 15:34
@NordicBuilder NordicBuilder removed the DNM label Oct 23, 2024
@rlubos rlubos merged commit 362afa7 into nrfconnect:main Oct 23, 2024
13 of 14 checks passed
@HaavardRei HaavardRei deleted the mesh_cherry_pick_2_8 branch October 24, 2024 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ble mesh Label for ble mesh PRbot. Add this if PR is related to ble mesh and you need to get review. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. manifest manifest-zephyr

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants