Skip to content

Commit a086d3b

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fwk-main
BRANCH=fwk-main TEST=Boots on azalea TEST=Boots on marigold BUG=None
2 parents 21f30bd + 014581f commit a086d3b

File tree

2,552 files changed

+73962
-22228
lines changed

Some content is hidden

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

2,552 files changed

+73962
-22228
lines changed

.clang-format

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ ForEachMacros:
3939
- 'FOR_EACH_IDX'
4040
- 'FOR_EACH_IDX_FIXED_ARG'
4141
- 'FOR_EACH_NONEMPTY_TERM'
42+
- 'FOR_EACH_FIXED_ARG_NONEMPTY_TERM'
4243
- 'RB_FOR_EACH'
4344
- 'RB_FOR_EACH_CONTAINER'
4445
- 'SYS_DLIST_FOR_EACH_CONTAINER'
@@ -68,8 +69,16 @@ ForEachMacros:
6869
- 'Z_GENLIST_FOR_EACH_NODE'
6970
- 'Z_GENLIST_FOR_EACH_NODE_SAFE'
7071
- 'STRUCT_SECTION_FOREACH'
72+
- 'STRUCT_SECTION_FOREACH_ALTERNATE'
7173
- 'TYPE_SECTION_FOREACH'
7274
- 'K_SPINLOCK'
75+
- 'COAP_RESOURCE_FOREACH'
76+
- 'COAP_SERVICE_FOREACH'
77+
- 'COAP_SERVICE_FOREACH_RESOURCE'
78+
- 'HTTP_RESOURCE_FOREACH'
79+
- 'HTTP_SERVER_CONTENT_TYPE_FOREACH'
80+
- 'HTTP_SERVICE_FOREACH'
81+
- 'HTTP_SERVICE_FOREACH_RESOURCE'
7382
IfMacros:
7483
- 'CHECKIF'
7584
# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
@@ -84,6 +93,7 @@ IncludeCategories:
8493
- Regex: '.*'
8594
Priority: 3
8695
IndentCaseLabels: false
96+
IndentGotoLabels: false
8797
IndentWidth: 8
8898
InsertBraces: true
8999
SpaceBeforeParens: ControlStatementsExceptControlMacros

.github/ISSUE_TEMPLATE/001_bug_report.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ labels: bug
66
assignees: ''
77

88
---
9-
10-
**Notes (delete this)**
9+
<!--
10+
**Notes**
1111
Github Discussions (https://github.com/zephyrproject-rtos/zephyr/discussions)
1212
are available to first verify that the issue is a genuine Zephyr bug and not a
1313
consequence of Zephyr services misuse.
@@ -16,8 +16,10 @@ This issue list is only for bugs in the main Zephyr code base
1616
(https://github.com/zephyrproject-rtos/zephyr/). If the bug is for a project
1717
fork (such as NCS) specific feature, please open an issue in the fork project
1818
instead.
19+
-->
1920

2021
**Describe the bug**
22+
<!--
2123
A clear and concise description of what the bug is.
2224
2325
Please also mention any information which could help others to understand
@@ -27,31 +29,43 @@ the problem you're facing:
2729
- Is this a regression? If yes, have you been able to "git bisect" it to a
2830
specific commit?
2931
- ...
32+
-->
3033

3134
**To Reproduce**
35+
<!--
3236
Steps to reproduce the behavior:
3337
1. mkdir build; cd build
3438
2. cmake -DBOARD=board\_xyz
3539
3. make
3640
4. See error
41+
-->
3742

3843
**Expected behavior**
44+
<!--
3945
A clear and concise description of what you expected to happen.
46+
-->
4047

4148
**Impact**
49+
<!--
4250
What impact does this issue have on your progress (e.g., annoyance, showstopper)
51+
-->
4352

4453
**Logs and console output**
54+
<!--
4555
If applicable, add console logs or other types of debug information
4656
e.g Wireshark capture or Logic analyzer capture (upload in zip archive).
4757
copy-and-paste text and put a code fence (\`\`\`) before and after, to help
4858
explain the issue. (if unable to obtain text log, add a screenshot)
59+
-->
4960

5061
**Environment (please complete the following information):**
62+
5163
- OS: (e.g. Linux, MacOS, Windows)
5264
- Toolchain (e.g Zephyr SDK, ...)
5365
- Commit SHA or Version used
5466

5567
**Additional context**
68+
<!--
5669
Add any other context that could be relevant to your issue, such as pin setting,
5770
target configuration, ...
71+
-->

.github/ISSUE_TEMPLATE/002_enhancement.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,21 @@ assignees: ''
88
---
99

1010
**Is your enhancement proposal related to a problem? Please describe.**
11+
<!--
1112
A clear and concise description of what the problem is.
13+
-->
1214

1315
**Describe the solution you'd like**
16+
<!--
1417
A clear and concise description of what you want to happen.
18+
-->
1519

1620
**Describe alternatives you've considered**
21+
<!--
1722
A clear and concise description of any alternative solutions or features you've considered.
23+
-->
1824

1925
**Additional context**
26+
<!--
2027
Add any other context or graphics (drag-and-drop an image) about the feature request here.
28+
-->

.github/ISSUE_TEMPLATE/003_rfc-proposal.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,52 @@ assignees: ''
99

1010
## Introduction
1111

12+
<!--
1213
This section targets end users, TSC members, maintainers and anyone else that might
1314
need a quick explanation of your proposed change.
15+
-->
1416

1517
### Problem description
16-
18+
<!--
1719
Why do we want this change and what problem are we trying to address?
20+
-->
1821

1922
### Proposed change
20-
23+
<!--
2124
A brief summary of the proposed change - the 10,000 ft view on what it will
2225
change once this change is implemented.
26+
-->
2327

2428
## Detailed RFC
25-
29+
<!--
2630
In this section of the document the target audience is the dev team. Upon
2731
reading this section each engineer should have a rather clear picture of what
2832
needs to be done in order to implement the described feature.
33+
-->
2934

3035
### Proposed change (Detailed)
31-
36+
<!--
3237
This section is freeform - you should describe your change in as much detail
3338
as possible. Please also ensure to include any context or background info here.
3439
For example, do we have existing components which can be reused or altered.
3540
3641
By reading this section, each team member should be able to know what exactly
3742
you're planning to change and how.
43+
-->
3844

3945
### Dependencies
40-
46+
<!--
4147
Highlight how the change may affect the rest of the project (new components,
4248
modifications in other areas), or other teams/projects.
49+
-->
4350

4451
### Concerns and Unresolved Questions
45-
52+
<!--
4653
List any concerns, unknowns, and generally unresolved questions etc.
54+
-->
4755

4856
## Alternatives
49-
57+
<!--
5058
List any alternatives considered, and the reasons for choosing this option
5159
over them.
60+
-->

.github/ISSUE_TEMPLATE/004_feature_request.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,21 @@ assignees: ''
88
---
99

1010
**Is your feature request related to a problem? Please describe.**
11+
<!--
1112
A clear and concise description of what the problem is.
13+
-->
1214

1315
**Describe the solution you'd like**
16+
<!--
1417
A clear and concise description of what you want to happen.
18+
-->
1519

1620
**Describe alternatives you've considered**
21+
<!--
1722
A clear and concise description of any alternative solutions or features you've considered.
23+
-->
1824

1925
**Additional context**
26+
<!--
2027
Add any other context or graphics (drag-and-drop an image) about the feature request here.
28+
-->

.github/SECURITY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ updates:
1111
At this time, with the latest release of v3.6, the supported
1212
versions are:
1313

14-
- v2.7: Current LTS
15-
- v3.5: Prior release
16-
- v3.6: Current release
14+
- v3.7: Current LTS
15+
- v3.6: Prior release
16+
- v2.7: Prior LTS
1717

1818
## Reporting process
1919

.github/workflows/compliance.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Compliance Checks
22

3-
on: pull_request
3+
on:
4+
pull_request:
5+
types:
6+
- edited
7+
- opened
8+
- reopened
9+
- synchronize
410

511
jobs:
612
check_compliance:
@@ -52,6 +58,14 @@ jobs:
5258
west config manifest.group-filter -- +ci,-optional
5359
west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
5460
61+
- name: Check for PR description
62+
if: ${{ github.event.pull_request.body == '' }}
63+
continue-on-error: true
64+
id: pr_description
65+
run: |
66+
echo "Pull request description cannot be empty."
67+
exit 1
68+
5569
- name: Run Compliance Tests
5670
continue-on-error: true
5771
id: compliance
@@ -94,5 +108,12 @@ jobs:
94108
done
95109
96110
if [ "${exit}" == "1" ]; then
111+
echo "Compliance error, check for error messages in the \"Run Compliance Tests\" step"
112+
echo "You can run this step locally with the ./scripts/ci/check_compliance.py script."
113+
exit 1;
114+
fi
115+
116+
if [ "${{ steps.pr_description.outcome }}" == "failure" ]; then
117+
echo "PR description cannot be empty"
97118
exit 1;
98119
fi

.github/workflows/doc-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ jobs:
149149
150150
- name: compress-docs
151151
run: |
152-
tar cfJ html-output.tar.xz --directory=doc/_build html
153-
tar cfJ api-output.tar.xz --directory=doc/_build html/doxygen/html
154-
tar cfJ api-coverage.tar.xz coverage-report
152+
tar --use-compress-program="xz -T0" -cf html-output.tar.xz --directory=doc/_build html
153+
tar --use-compress-program="xz -T0" -cf api-output.tar.xz --directory=doc/_build html/doxygen/html
154+
tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
155155
156156
- name: upload-build
157157
uses: actions/upload-artifact@v4

.github/workflows/manifest.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ jobs:
2626
west init -l . || true
2727
2828
- name: Manifest
29-
uses: zephyrproject-rtos/action-manifest@v1.2.2
29+
uses: zephyrproject-rtos/action-manifest@v1.3.1
3030
with:
3131
github-token: ${{ secrets.ZB_GITHUB_TOKEN }}
3232
manifest-path: 'west.yml'
3333
checkout-path: 'zephyrproject/zephyr'
3434
use-tree-checkout: 'true'
35+
check-impostor-commits: 'true'
3536
label-prefix: 'manifest-'
3637
verbosity-level: '1'
3738
labels: 'manifest'

.github/workflows/twister_tests_blackbox.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
echo "$HOME/.local/bin" >> $GITHUB_PATH
4444
4545
west init -l . || true
46+
# we do not depend on any hals, tools or bootloader, save some time and space...
47+
west config manifest.group-filter -- -hal,-tools,-bootloader
4648
west config --global update.narrow true
4749
west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /github/cache/zephyrproject)
4850
west forall -c 'git reset --hard HEAD'

0 commit comments

Comments
 (0)