Skip to content

Commit 99026c0

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into staging
2 parents 19a1950 + 0648e49 commit 99026c0

File tree

8,037 files changed

+275550
-102373
lines changed

Some content is hidden

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

8,037 files changed

+275550
-102373
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ IndentCaseLabels: false
9999
IndentGotoLabels: false
100100
IndentWidth: 8
101101
InsertBraces: true
102+
InsertNewlineAtEOF: true
102103
SpaceBeforeInheritanceColon: False
103104
SpaceBeforeParens: ControlStatementsExceptControlMacros
104105
SortIncludes: Never

.github/ISSUE_TEMPLATE/007_ext-source.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ required to maintain ...)
4949
Why is this the right component to solve it (e.g., SQLite is small,
5050
easy to use, and has a very liberal license.)
5151

52+
## Security
53+
54+
Does this component include any cryptographic functionality?
55+
If so, please describe the cryptographic algorithms and protocols used.
56+
57+
How does this component handle security vulnerabilities and updates?
58+
Are there any known vulnerabilities in this component? If so, please
59+
provide details and references to any CVEs or security advisories.
60+
5261
## Dependencies
5362

5463
What other components does this package depend on?

.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 v4.0, the supported
1212
versions are:
1313

14-
- v4.0: Current release
15-
- v3.7: Prior release and Current LTS
16-
- v2.7: Prior LTS
14+
- v4.1: Current release
15+
- v4.0: Prior release
16+
- v3.7: Current LTS
1717

1818
## Reporting process
1919

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
paths:
2+
- .github
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
paths:
2+
- doc

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
version: 2
2+
enable-beta-ecosystems: true
23
updates:
34
- package-ecosystem: "github-actions"
45
directory: "/"
@@ -11,3 +12,15 @@ updates:
1112
actions-deps:
1213
patterns:
1314
- "*"
15+
16+
- package-ecosystem: "uv"
17+
directory: "/doc"
18+
schedule:
19+
interval: "weekly"
20+
commit-message:
21+
prefix: "ci: doc: "
22+
labels: []
23+
groups:
24+
doc-deps:
25+
patterns:
26+
- "*"

.github/workflows/assigner.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,36 @@ on:
1515
types:
1616
- labeled
1717

18+
permissions:
19+
contents: read
20+
1821
jobs:
1922
assignment:
2023
name: Pull Request Assignment
2124
if: github.event.pull_request.draft == false
22-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
26+
permissions:
27+
pull-requests: write # to add assignees to pull requests
28+
issues: write # to add assignees to issues
2329

2430
steps:
25-
- name: Install Python dependencies
26-
run: |
27-
pip install -U PyGithub>=1.55 west
28-
2931
- name: Check out source code
30-
uses: actions/checkout@v4
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
34+
- name: Set up Python
35+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
36+
with:
37+
python-version: 3.12
38+
cache: pip
39+
cache-dependency-path: scripts/requirements-actions.txt
40+
41+
- name: Install Python packages
42+
run: |
43+
pip install -r scripts/requirements-actions.txt --require-hashes
3144
3245
- name: Run assignment script
3346
env:
34-
GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
47+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3548
run: |
3649
FLAGS="-v"
3750
FLAGS+=" -o ${{ github.event.repository.owner.login }}"

.github/workflows/backport.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@ on:
77
branches:
88
- main
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
backport:
1215
name: Backport
13-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
17+
permissions:
18+
contents: write # to create/push backport branches
19+
pull-requests: write # to create backport PRs
20+
issues: write # to add labels to issue created if backport fails
1421
# Only react to merged PRs for security reasons.
1522
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
1623
if: >
@@ -24,8 +31,8 @@ jobs:
2431
)
2532
steps:
2633
- name: Backport
27-
uses: zephyrproject-rtos/action-backport@v2.0.3-3
34+
uses: zephyrproject-rtos/action-backport@7e74f601d11eaca577742445e87775b5651a965f # v2.0.3-3
2835
with:
29-
github_token: ${{ secrets.ZB_GITHUB_TOKEN }}
36+
github_token: ${{ secrets.GITHUB_TOKEN }}
3037
issue_labels: Backport
3138
labels_template: '["Backport"]'

.github/workflows/backport_issue_check.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,41 @@ on:
1010
branches:
1111
- v*-branch
1212

13+
permissions:
14+
contents: read
15+
1316
jobs:
1417
backport:
1518
name: Backport Issue Check
1619
concurrency:
1720
group: backport-issue-check-${{ github.ref }}
1821
cancel-in-progress: true
19-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2023
if: github.repository == 'zephyrproject-rtos/zephyr'
24+
permissions:
25+
issues: read # to check if associated issue exists for backport
2126

2227
steps:
2328
- name: Check out source code
24-
uses: actions/checkout@v4
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
31+
- name: Set up Python
32+
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
33+
with:
34+
python-version: 3.12
35+
cache: pip
36+
cache-dependency-path: scripts/requirements-actions.txt
2537

26-
- name: Install Python dependencies
38+
- name: Install Python packages
2739
run: |
28-
pip install -U pygithub
40+
pip install -r scripts/requirements-actions.txt --require-hashes
2941
3042
- name: Run backport issue checker
3143
env:
32-
GITHUB_TOKEN: ${{ secrets.ZB_GITHUB_TOKEN }}
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3345
run: |
3446
./scripts/release/list_backports.py \
35-
-o ${{ github.event.repository.owner.login }} \
36-
-r ${{ github.event.repository.name }} \
37-
-b ${{ github.event.pull_request.base.ref }} \
38-
-p ${{ github.event.pull_request.number }}
47+
-o ${{ github.event.repository.owner.login }} \
48+
-r ${{ github.event.repository.name }} \
49+
-b ${{ github.event.pull_request.base.ref }} \
50+
-p ${{ github.event.pull_request.number }}

.github/workflows/bsim-tests-publish.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,26 @@ on:
55
workflows: ["BabbleSim Tests"]
66
types:
77
- completed
8+
9+
permissions:
10+
contents: read
11+
812
jobs:
913
bsim-test-results:
1014
name: "Publish BabbleSim Test Results"
11-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1216
if: github.event.workflow_run.conclusion != 'skipped'
17+
permissions:
18+
checks: write # to create the check run entry with test results
1319

1420
steps:
1521
- name: Download artifacts
16-
uses: dawidd6/action-download-artifact@v8
22+
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
1723
with:
1824
run_id: ${{ github.event.workflow_run.id }}
1925

2026
- name: Publish BabbleSim Test Results
21-
uses: EnricoMi/publish-unit-test-result-action@v2
27+
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
2228
with:
2329
check_name: BabbleSim Test Results
2430
comment_mode: off

0 commit comments

Comments
 (0)