Skip to content

Commit ac4b63c

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into feature/usb_dwc2_host_support
2 parents 426ed18 + 1814b90 commit ac4b63c

File tree

18,109 files changed

+709260
-205663
lines changed

Some content is hidden

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

18,109 files changed

+709260
-205663
lines changed

.checkpatch.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@
2929
--ignore ENOSYS
3030
--ignore IS_ENABLED_CONFIG
3131
--ignore EXPORT_SYMBOL
32+
--ignore COMPARISON_TO_NULL

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ indent_size = 8
8686
[COMMIT_EDITMSG]
8787
max_line_length = 75
8888

89+
# Patches
90+
[{*.patch,*.diff}]
91+
trim_trailing_whitespace = false
92+
8993
# Kconfig
9094
[Kconfig*]
9195
indent_style = tab

.github/SECURITY.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ updates:
88
- The most recent release, and the release prior to that.
99
- Active LTS releases.
1010

11-
At this time, with the latest release of v4.2, the supported
11+
At this time, with the latest release of v4.3, the supported
1212
versions are:
1313

14-
- v4.2: Current release
15-
- v4.1: Prior release
14+
- v4.3: Current release
15+
- v4.2: Prior release
1616
- v3.7: Current LTS
1717

1818
## Reporting process

.github/workflows/assigner.yml

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Pull Request Assigner
1+
name: Pull Request/Issue Assigner
22

33
on:
44
pull_request_target:
@@ -20,27 +20,39 @@ permissions:
2020

2121
jobs:
2222
assignment:
23-
name: Pull Request Assignment
23+
name: Pull Request/Issue Assignment
2424
if: github.event.pull_request.draft == false
2525
runs-on: ubuntu-24.04
2626
permissions:
27-
pull-requests: write # to add assignees to pull requests
2827
issues: write # to add assignees to issues
2928

3029
steps:
3130
- name: Check out source code
32-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32+
with:
33+
fetch-depth: 0
34+
persist-credentials: false
3335

3436
- name: Set up Python
35-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
37+
uses: zephyrproject-rtos/action-python-env@32e53bef090c33d53aa94f1d9a9d29c93cfdc5f7 # main
3638
with:
3739
python-version: 3.12
38-
cache: pip
39-
cache-dependency-path: scripts/requirements-actions.txt
4040

41-
- name: Install Python packages
41+
- name: Fetch west.yml/Maintainer.yml from pull request
42+
if: >
43+
github.event_name == 'pull_request_target'
44+
run: |
45+
git fetch origin pull/${{ github.event.pull_request.number }}/merge
46+
git show FETCH_HEAD:west.yml > pr_west.yml
47+
git show FETCH_HEAD:MAINTAINERS.yml > pr_MAINTAINERS.yml
48+
49+
- name: west setup
50+
if: >
51+
github.event_name == 'pull_request_target'
4252
run: |
43-
pip install -r scripts/requirements-actions.txt --require-hashes
53+
git config --global user.email "[email protected]"
54+
git config --global user.name "Your Name"
55+
west init -l . || true
4456
4557
- name: Run assignment script
4658
env:
@@ -51,14 +63,22 @@ jobs:
5163
FLAGS+=" -r ${{ github.event.repository.name }}"
5264
FLAGS+=" -M MAINTAINERS.yml"
5365
if [ "${{ github.event_name }}" = "pull_request_target" ]; then
54-
FLAGS+=" -P ${{ github.event.pull_request.number }}"
66+
FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml --updated-maintainer-file pr_MAINTAINERS.yml"
5567
elif [ "${{ github.event_name }}" = "issues" ]; then
56-
FLAGS+=" -I ${{ github.event.issue.number }}"
68+
FLAGS+=" -I ${{ github.event.issue.number }}"
5769
elif [ "${{ github.event_name }}" = "schedule" ]; then
58-
FLAGS+=" --modules"
70+
FLAGS+=" --modules"
5971
else
6072
echo "Unknown event: ${{ github.event_name }}"
6173
exit 1
6274
fi
75+
python3 scripts/ci/set_assignees.py $FLAGS
6376
64-
python3 scripts/set_assignees.py $FLAGS
77+
- name: Check maintainer file changes
78+
if: >
79+
github.event_name == 'pull_request_target'
80+
env:
81+
GITHUB_TOKEN: ${{ secrets.ZB_PR_ASSIGNER_GITHUB_TOKEN }}
82+
run: |
83+
python ./scripts/ci/check_maintainer_changes.py \
84+
--repo zephyrproject-rtos/zephyr MAINTAINERS.yml pr_MAINTAINERS.yml

.github/workflows/backport_issue_check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626

2727
steps:
2828
- name: Check out source code
29-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
32+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3333
with:
3434
python-version: 3.12
3535
cache: pip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run_id: ${{ github.event.workflow_run.id }}
2525

2626
- name: Publish BabbleSim Test Results
27-
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
27+
uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
2828
with:
2929
check_name: BabbleSim Test Results
3030
comment_mode: off

.github/workflows/bsim-tests.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on:
4343
group: zephyr-runner-v2-linux-x64-4xlarge
4444
container:
45-
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.1.20250624
45+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
4646
options: '--entrypoint /bin/bash'
4747
env:
4848
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
@@ -74,7 +74,7 @@ jobs:
7474
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
7575
7676
- name: Checkout
77-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
77+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7878
with:
7979
fetch-depth: 0
8080

@@ -97,8 +97,12 @@ jobs:
9797
9898
echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
9999
100+
- name: Install Python packages
101+
run: |
102+
pip install -r scripts/requirements-actions.txt --require-hashes
103+
100104
- name: Check common triggering files
101-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
105+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
102106
id: check-common-files
103107
with:
104108
files: |
@@ -117,7 +121,7 @@ jobs:
117121
modules/hal_nordic/**
118122
119123
- name: Check if Bluethooth files changed
120-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
124+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
121125
id: check-bluetooth-files
122126
with:
123127
files: |
@@ -127,7 +131,7 @@ jobs:
127131
tests/bsim/bluetooth/
128132
129133
- name: Check if Networking files changed
130-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
134+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
131135
id: check-networking-files
132136
with:
133137
files: |
@@ -140,7 +144,7 @@ jobs:
140144
include/zephyr/net/ieee802154*
141145
142146
- name: Check if UART files changed
143-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
147+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
144148
id: check-uart-files
145149
with:
146150
files: |
@@ -185,23 +189,23 @@ jobs:
185189
186190
- name: Upload Unit Test Results in HTML
187191
if: always()
188-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
192+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
189193
with:
190194
name: HTML Unit Test Results
191195
if-no-files-found: ignore
192196
path: |
193197
junit.html
194198
195199
- name: Publish Unit Test Results
196-
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
200+
uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
197201
with:
198202
check_name: Bsim Test Results
199203
files: "junit.xml"
200204
comment_mode: off
201205

202206
- name: Upload Event Details
203207
if: always()
204-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
208+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
205209
with:
206210
name: event
207211
path: |

.github/workflows/bug_snapshot.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ name: Bug Snapshot
88

99
on:
1010
workflow_dispatch:
11-
branches: [main]
1211
schedule:
1312
# Run daily at 00:05
1413
- cron: '5 00 * * *'
@@ -20,14 +19,14 @@ jobs:
2019
make_bugs_pickle:
2120
name: Make bugs pickle
2221
runs-on: ubuntu-24.04
23-
if: github.repository_owner == 'zephyrproject-rtos'
22+
if: github.repository_owner == 'zephyrproject-rtos' && github.ref == 'refs/heads/main'
2423

2524
steps:
2625
- name: Checkout
27-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2827

2928
- name: Set up Python
30-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
29+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
3130
with:
3231
python-version: 3.12
3332
cache: pip
@@ -52,7 +51,7 @@ jobs:
5251
echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
5352
5453
- name: Configure AWS Credentials
55-
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
54+
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
5655
with:
5756
aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
5857
aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}

.github/workflows/clang.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on:
1919
group: zephyr-runner-v2-linux-x64-4xlarge
2020
container:
21-
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.1.20250624
21+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
2222
options: '--entrypoint /bin/bash'
2323
strategy:
2424
fail-fast: false
@@ -53,7 +53,7 @@ jobs:
5353
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
5454
5555
- name: Checkout
56-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
56+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5757
with:
5858
fetch-depth: 0
5959
persist-credentials: false
@@ -86,6 +86,10 @@ jobs:
8686
gcc --version
8787
ls -la
8888
89+
- name: Install Python packages
90+
run: |
91+
pip install -r scripts/requirements-actions.txt --require-hashes
92+
8993
- name: Set up ccache
9094
run: |
9195
mkdir -p ${CCACHE_DIR}
@@ -119,7 +123,7 @@ jobs:
119123
120124
- name: Upload Unit Test Results
121125
if: always()
122-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
126+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
123127
with:
124128
name: Unit Test Results (Subset ${{ matrix.subset }})
125129
path: |
@@ -136,18 +140,18 @@ jobs:
136140
if: (success() || failure())
137141
steps:
138142
- name: Checkout
139-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
143+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
140144
with:
141145
fetch-depth: 0
142146
persist-credentials: false
143147

144148
- name: Download Artifacts
145-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
149+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
146150
with:
147151
path: artifacts
148152

149153
- name: Set up Python
150-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
154+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
151155
with:
152156
python-version: 3.12
153157
cache: pip
@@ -159,20 +163,20 @@ jobs:
159163
160164
- name: Merge Test Results
161165
run: |
162-
junitparser merge artifacts/*/twister.xml junit.xml
166+
junitparser merge --glob 'artifacts/*/twister.xml' 'artifacts/*/*/twister.xml' junit.xml
163167
junit2html junit.xml junit-clang.html
164168
165169
- name: Upload Unit Test Results in HTML
166170
if: always()
167-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
171+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
168172
with:
169173
name: HTML Unit Test Results
170174
if-no-files-found: ignore
171175
path: |
172176
junit-clang.html
173177
174178
- name: Publish Unit Test Results
175-
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
179+
uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
176180
if: always()
177181
with:
178182
check_name: Unit Test Results

0 commit comments

Comments
 (0)