Skip to content

Commit eb73021

Browse files
authored
chore: update to latest NCS (#25)
### Summary Update internal dogfood branch to latest NCS. ### Test Plan Performed the merge locally and confirmed successful build with asset tracker app.
2 parents f61f3fe + 6b6426a commit eb73021

File tree

6,291 files changed

+345634
-141481
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,291 files changed

+345634
-141481
lines changed

.checkpatch.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,19 @@
3535
--exclude samples/matter/.*/src
3636
--exclude applications/matter_bridge/src
3737
--exclude applications/matter_weather_station/src
38+
--exclude samples/matter/.*/zap-generated
39+
--exclude applications/matter_bridge/.*/zap-generated
40+
--exclude applications/matter_weather_station/.*/zap-generated
3841
--exclude samples/openthread/cli/harness-thci-1-3
3942
--exclude modules/tfm/tfm/boards/src
4043
--exclude modules/tfm/tfm/boards/common
4144
--exclude subsys/nrf_security/src/legacy
45+
--exclude subsys/sdfw_services/services/.*/zcbor_generated
4246
--exclude doc/nrf/images
4347
--exclude doc/nrf/.*/images
4448
--exclude doc/nrf/.*/.*/images
4549
--exclude doc/nrf/.*/.*/.*/images
4650
--exclude doc/nrf/.*/.*/.*/.*/images
4751
--exclude applications/nrf5340_audio/src/utils/macros
52+
--exclude lib/at_parser/generated
4853
--exclude lib/bin/lwm2m_carrier/include

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ IncludeCategories:
7878
- Regex: '.*'
7979
Priority: 3
8080
IndentCaseLabels: false
81+
IndentGotoLabels: false
8182
IndentWidth: 8
8283
InsertBraces: true
8384
SpaceBeforeParens: ControlStatementsExceptControlMacros

.editorconfig

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# EditorConfig: https://editorconfig.org/
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# All (Defaults)
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
max_line_length = 100
13+
14+
# Assembly
15+
[*.S]
16+
indent_style = tab
17+
indent_size = 8
18+
19+
# C
20+
[*.{c,h}]
21+
indent_style = tab
22+
indent_size = 8
23+
24+
# C++
25+
[*.{cpp,hpp}]
26+
indent_style = tab
27+
indent_size = 8
28+
29+
# Linker Script
30+
[*.ld]
31+
indent_style = tab
32+
indent_size = 8
33+
34+
# Python
35+
[*.py]
36+
indent_style = space
37+
indent_size = 4
38+
39+
# Perl
40+
[*.pl]
41+
indent_style = tab
42+
indent_size = 8
43+
44+
# reStructuredText
45+
[*.rst]
46+
indent_style = space
47+
indent_size = 3
48+
49+
# YAML
50+
[*.{yml,yaml}]
51+
indent_style = space
52+
indent_size = 2
53+
54+
# Shell Script
55+
[*.sh]
56+
indent_style = space
57+
indent_size = 4
58+
59+
# Windows Command Script
60+
[*.cmd]
61+
end_of_line = crlf
62+
indent_style = tab
63+
indent_size = 8
64+
65+
# Valgrind Suppression File
66+
[*.supp]
67+
indent_style = space
68+
indent_size = 3
69+
70+
# CMake
71+
[{CMakeLists.txt,*.cmake}]
72+
indent_style = space
73+
indent_size = 2
74+
75+
# Makefile
76+
[Makefile]
77+
indent_style = tab
78+
indent_size = 8
79+
80+
# Device tree
81+
[*.{dts,dtsi,overlay}]
82+
indent_style = tab
83+
indent_size = 8
84+
85+
# Git commit messages
86+
[COMMIT_EDITMSG]
87+
max_line_length = 75
88+
89+
# Kconfig
90+
[Kconfig*]
91+
indent_style = tab
92+
indent_size = 8

.github/test-spec.yml

Lines changed: 64 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757

5858
"CI-audio-test":
5959
- "applications/nrf5340_audio/**/*"
60-
- "boards/arm/nrf5340_audio_dk_nrf5340/**/*"
6160
- "tests/nrf5340_audio/**/*"
6261
- "tests/lib/contin_array/**/*"
6362
- "tests/lib/pcm_mix/**/*"
@@ -69,7 +68,6 @@
6968
- "lib/data_fifo/**/*"
7069
- "lib/pcm_stream_channel_modifier/**/*"
7170
- "lib/tone/**/*"
72-
- "lib/bin/bt_ll_acs_nrf53/**/*"
7371

7472
"CI-iot-samples-test":
7573
- "include/modem/at_monitor.h"
@@ -156,24 +154,26 @@
156154
- "include/fw_info.*"
157155
- "include/mgmt/*"
158156
- "include/net/**/*"
159-
- "cmake/*"
160-
- "lib/lte_link_control/**/*"
157+
- "cmake/**/*"
158+
- "sysbuild/**/*"
161159
- "modules/mcuboot/**/*"
162160
- "modules/trusted-firmware-m/*"
163-
- "samples/nrf5340/netboot/*"
161+
- "samples/nrf5340/netboot/**/*"
162+
- "samples/nrf5340/extxip_smp_svr/**/*"
164163
- "samples/bootloader/**/*"
165164
- "scripts/bootloader/**/*"
166165
- "subsys/bootloader/**/*"
167166
- "subsys/nonsecure/*"
168167
- "subsys/partition_manager/*"
169168
- "subsys/fw_info/**/*"
170169
- "subsys/mgmt/**/*"
171-
- "subsys/pcd/*"
170+
- "subsys/pcd/**/*"
172171
- "tests/subsys/bootloader/**/*"
172+
- "tests/subsys/dfu/**/*"
173+
- "tests/modules/mcuboot/**/*"
173174

174175
"CI-all-test":
175-
- "**/*partition_manager*/**/*"
176-
- "**/*partition_manager*"
176+
- "subsys/partition_manager/**/*"
177177

178178
"CI-tfm-test":
179179
- "cmake/*"
@@ -264,29 +264,27 @@
264264
- "subsys/bluetooth/*"
265265
- "subsys/caf/**/*"
266266
- "subsys/partition_manager/**/*"
267+
- "samples/ipc/**/*"
267268

268269
"CI-desktop-test":
269270
- "applications/nrf_desktop/**/*"
270-
- "boards/arm/*dmouse*/**/*"
271-
- "boards/arm/*kbd*/**/*"
272-
- "boards/arm/*dongle*/**/*"
273-
- "boards/arm/*gmouse*/**/*"
271+
- "boards/nordic/*mouse/**/*"
272+
- "boards/nordic/*kbd/**/*"
273+
- "boards/nordic/*dongle/**/*"
274274
- "cmake/*"
275-
- "drivers/sensor/pmw3360/**/*"
276275
- "drivers/sensor/paw3212/**/*"
276+
- "drivers/sensor/pmw3360/**/*"
277277
- "dts/bindings/sensor/pixart*"
278-
- "include/bluetooth/services/**/*"
279-
- "include/bluetooth/*"
278+
- "include/bluetooth/**/*"
280279
- "include/caf/**/*"
281280
- "include/sensor/*"
282-
- "include/app_event_manager.h"
283-
- "include/nrf_profiler.h"
284281
- "scripts/hid_configurator/**/*"
285-
- "subsys/bluetooth/services/**/*"
286-
- "subsys/bluetooth/adv_prov/**/*"
282+
- "subsys/app_event_manager/**/*"
287283
- "subsys/bluetooth/*"
284+
- "subsys/bluetooth/adv_prov/**/*"
285+
- "subsys/bluetooth/controller/**/*"
286+
- "subsys/bluetooth/services/**/*"
288287
- "subsys/caf/**/*"
289-
- "subsys/app_event_manager/**/*"
290288
- "subsys/partition_manager/**/*"
291289

292290
"CI-crypto-test":
@@ -520,3 +518,49 @@
520518
- "subsys/nrf_security/**/*"
521519
- "!subsys/nrf_security/doc/**/*"
522520
- "!subsys/nrf_security/*.rst"
521+
522+
"CI-suit-dfu-test":
523+
- "include/bl*"
524+
- "include/fprotect.h"
525+
- "include/dfu/*suit*"
526+
- "include/sdfw/sdfw_services/*"
527+
- "cmake/**/*"
528+
- "sysbuild/**/*"
529+
- "lib/dk_buttons_and_leds/**/*"
530+
- "subsys/dfu/*"
531+
- "subsys/nrf_rpc/**/*"
532+
- "subsys/nrf_security/**/*"
533+
- "subsys/sdfw_services/**/*"
534+
- "subsys/suit/**/*"
535+
- "samples/suit/**/*"
536+
- "subsys/mgmt/suitfu/**/*"
537+
- "tests/subsys/suit/**/*"
538+
539+
"CI-suit-dfu-test-extended":
540+
- "include/dfu/*suit*"
541+
- "include/sdfw/sdfw_services/*"
542+
- "subsys/sdfw_services/**/*"
543+
- "subsys/suit/**/*"
544+
- "samples/suit/**/*"
545+
- "subsys/mgmt/suitfu/**/*"
546+
- "tests/subsys/suit/**/*"
547+
548+
"CI-test-low-level":
549+
- "applications/sw_io_devices/**/*"
550+
- "drivers/gpio/**/*"
551+
- "dts/bindings/gpio/**/*"
552+
- "include/drivers/gpio/**/*"
553+
- "include/event_manager_proxy.h"
554+
- "subsys/event_manager_proxy/**/*"
555+
- "samples/ipc/**/*"
556+
- "samples/event_manager_proxy/**/*"
557+
- "snippets/emulated-*/**/*"
558+
- "tests/subsys/event_manager_proxy/**/*"
559+
- "tests/benchmarks/multicore/**/*"
560+
- "tests/drivers/pwm/**/*"
561+
- "tests/drivers/sensor/**/*"
562+
563+
"CI-ps-test":
564+
- "samples/nrf_rpc/protocols_serialization/**/*"
565+
- "subsys/net/openthread/rpc/**/*"
566+
- "subsys/nrf_rpc/**/*"

.github/workflows/backport.yml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,28 @@ on:
44
types:
55
- closed
66
- labeled
7+
branches:
8+
- main
79

810
jobs:
911
backport:
10-
runs-on: ubuntu-20.04
1112
name: Backport
13+
runs-on: ubuntu-22.04
14+
# Only react to merged PRs for security reasons.
15+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16+
if: >
17+
github.event.pull_request.merged &&
18+
(
19+
github.event.action == 'closed' ||
20+
(
21+
github.event.action == 'labeled' &&
22+
contains(github.event.label.name, 'backport')
23+
)
24+
)
1225
steps:
1326
- name: Backport
14-
uses: zephyrproject-rtos/action-backport@v1.1.99
27+
uses: zephyrproject-rtos/action-backport@v2.0.3-3
1528
with:
16-
github_token: ${{ secrets.GITHUB_TOKEN }}
29+
github_token: ${{ secrets.NCS_GITHUB_TOKEN }}
30+
issue_labels: Backport
31+
labels_template: '["Backport"]'

.github/workflows/compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
echo "$HOME/.local/bin" >> $GITHUB_PATH
1313
1414
- name: Checkout sources
15-
uses: nordicbuilder/action-checkout-west-update@main
15+
uses: nrfconnect/action-checkout-west-update@main
1616
with:
1717
git-fetch-depth: 0
1818
git-ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/create-upmerge-PRs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout sources
20-
uses: nordicbuilder/action-checkout-west-update@main
20+
uses: nrfconnect/action-checkout-west-update@main
2121
with:
2222
git-fetch-depth: 0
2323
west-update-args: 'zephyr bsim mcuboot'

.github/workflows/docbuild.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ on:
1212
- '**/Kconfig'
1313
- '**/sample.yaml'
1414
- 'doc/**'
15+
- 'applications/**'
1516
- 'include/**'
17+
- 'lib/**'
1618
- 'doc/requirements.txt'
1719
- 'scripts/tools-versions-*.yml'
1820
- 'west.yml'
@@ -31,7 +33,7 @@ jobs:
3133
cancel-in-progress: true
3234
steps:
3335
- name: Checkout sources
34-
uses: nordicbuilder/action-checkout-west-update@main
36+
uses: nrfconnect/action-checkout-west-update@main
3537

3638
- name: cache-pip
3739
uses: actions/cache@v3

.github/workflows/license-reusable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
name: Run license checks on patch series (PR)
3838
steps:
3939
- name: Checkout sources
40-
uses: nordicbuilder/action-checkout-west-update@main
40+
uses: nrfconnect/action-checkout-west-update@main
4141
with:
4242
git-fetch-depth: 0
4343
git-ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/oss-history.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
name: Check OSS history
88
steps:
99
- name: Checkout sources
10-
uses: nordicbuilder/action-checkout-west-update@main
10+
uses: nrfconnect/action-checkout-west-update@main
1111
with:
1212
git-fetch-depth: 0
1313
west-update-args: ''

0 commit comments

Comments
 (0)