Skip to content

Commit e87c164

Browse files
RobertGalatNordictotyz
authored andcommitted
manifest: move sidewalk project to add-on
remove sidewalk project from west.yml, to move it as out of tree project in add-on. remove Sidewalk from test-spec Signed-off-by: Robert Gałat <robert.galat@nordicsemi.no>
1 parent 50ae83e commit e87c164

File tree

5 files changed

+3
-69
lines changed

5 files changed

+3
-69
lines changed

.github/test-spec.yml

-13
Original file line numberDiff line numberDiff line change
@@ -580,19 +580,6 @@
580580
- "subsys/partition_manager/**/*"
581581
- "tests/subsys/net/lib/nrf_cloud/**/*"
582582

583-
"CI-sidewalk-test":
584-
- "subsys/bootloader/**/*"
585-
- "subsys/partition_manager/**/*"
586-
- "subsys/dfu/**/*"
587-
- "modules/mcuboot/**/*"
588-
- "subsys/fw_info/*"
589-
- "subsys/pcd/**/*"
590-
- "subsys/bluetooth/controller/*"
591-
- any:
592-
- "subsys/nrf_security/**/*"
593-
- "!subsys/nrf_security/doc/**/*"
594-
- "!subsys/nrf_security/*.rst"
595-
596583
"CI-suit-dfu-test":
597584
- "include/bl*"
598585
- "include/fprotect.h"

.github/workflows/src-mirror.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
git-fetch-depth: 0
1515
path: workspace/nrf
16-
west-update-args: '--group-filter=+babblesim,+sidewalk'
16+
west-update-args: '--group-filter=+babblesim'
1717

1818
- name: Configure git and run garbage collection
1919
run: |

scripts/ci/tags.yaml

-46
Original file line numberDiff line numberDiff line change
@@ -368,52 +368,6 @@ ci_tests_lib_date_time_unity:
368368
- nrf/tests/lib/date_time/
369369
- nrf/tests/mocks/nrf_modem_at/
370370

371-
Sidewalk:
372-
files:
373-
- bootloader/mcuboot/
374-
- modules/crypto/mbedtls/
375-
- modules/crypto/oberon-psa-crypto/
376-
- modules/crypto/tinycrypt/
377-
- modules/lib/open-amp/open-amp/
378-
- modules/lib/zcbor/
379-
- nrf/applications/ipc_radio/
380-
- nrf/drivers/entropy/
381-
- nrf/drivers/hw_cc3xx/
382-
- nrf/drivers/mpsl/
383-
- nrf/lib/dk_buttons_and_leds/
384-
- nrf/lib/fatal_error/
385-
- nrf/lib/fprotect/
386-
- nrf/modules/mcuboot/
387-
- nrf/subsys/bluetooth/controller/
388-
- nrf/subsys/bootloader/
389-
- nrf/subsys/dfu/
390-
- nrf/subsys/fw_info/
391-
- nrf/subsys/mpsl/
392-
- nrf/subsys/nrf_security/
393-
- nrf/subsys/partition_manager/
394-
- nrf/subsys/pcd/
395-
- nrf/subsys/trusted_storage/
396-
- nrfxlib/crypto/
397-
- sidewalk/
398-
- zephyr/include/dfu/
399-
- zephyr/include/mgmt/mcumgr/
400-
- zephyr/samples/bluetooth/hci_ipc/
401-
- zephyr/soc/nordic/
402-
- zephyr/subsys/dfu/
403-
- zephyr/subsys/fs/
404-
- zephyr/subsys/ipc/
405-
- zephyr/subsys/mem_mgmt/
406-
- zephyr/subsys/mgmt/
407-
- zephyr/subsys/mgmt/mcumgr/
408-
- zephyr/subsys/net/
409-
- zephyr/subsys/pm/
410-
- zephyr/subsys/random/
411-
- zephyr/subsys/settings/
412-
- zephyr/subsys/settings/
413-
- zephyr/subsys/shell/
414-
- zephyr/subsys/storage/
415-
- zephyr/subsys/usb/
416-
417371
find_my:
418372
files:
419373
- bootloader/mcuboot/

scripts/tag_west_repos.sh

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ declare -A PROJECT_TAGS
4444
# nrfx/nRF/srcx repositories: vX.Y.Z(-rcN)
4545
PROJECT_TAGS[nrfxlib]=""
4646
PROJECT_TAGS[find-my]=""
47-
PROJECT_TAGS[sidewalk]=""
4847
PROJECT_TAGS[matter]=""
4948
PROJECT_TAGS[nrf-802154]=""
5049
PROJECT_TAGS[suit-processor]=""

west.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ manifest:
4747
- -find-my
4848
- -babblesim
4949
- -libmodem
50-
- -sidewalk
5150
- -bsec
5251
- -doc-internal
5352
- +optional
@@ -66,7 +65,7 @@ manifest:
6665
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6766
- name: zephyr
6867
repo-path: sdk-zephyr
69-
revision: a2aa12bb3dcc1e9fac6ce451692f326bf6a6467c
68+
revision: 83390163009bfb440f9d811bd99a58970d286f9a
7069
import:
7170
# In addition to the zephyr repository itself, NCS also
7271
# imports the contents of zephyr/west.yml at the above
@@ -145,7 +144,7 @@ manifest:
145144
- name: nrfxlib
146145
repo-path: sdk-nrfxlib
147146
path: nrfxlib
148-
revision: 1bdf7dee04ba6cdc24537420b6c7c9f15363ee00
147+
revision: b89f3981d80e1c337a199e1c450f3a4817632128
149148
- name: trusted-firmware-m
150149
repo-path: sdk-trusted-firmware-m
151150
path: modules/tee/tf-m/trusted-firmware-m
@@ -196,11 +195,6 @@ manifest:
196195
upstream-url: https://github.com/DaveGamble/cJSON
197196
upstream-sha: d2735278ed1c2e4556f53a7a782063b31331dbf7
198197
compare-by-default: false
199-
- name: sidewalk
200-
repo-path: sdk-sidewalk
201-
revision: 735afa54b9c6658a698e990b18c2acb539b48dba
202-
groups:
203-
- sidewalk
204198
- name: find-my
205199
repo-path: sdk-find-my
206200
revision: 0f91f3c24984bddcd7938a3bb840c0f81f18a35c

0 commit comments

Comments
 (0)