Skip to content

Commit 373459e

Browse files
authored
Merge branch 'main' into main
2 parents cd81730 + 8c264d3 commit 373459e

File tree

3,235 files changed

+98033
-28594
lines changed

Some content is hidden

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

3,235 files changed

+98033
-28594
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

.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: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,17 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Set up Python
37-
uses: zephyrproject-rtos/action-python-env@ace91a63fd503cd618ff1eb83fbcf302dabd7d44 # main
37+
uses: zephyrproject-rtos/action-python-env@32e53bef090c33d53aa94f1d9a9d29c93cfdc5f7 # main
3838
with:
3939
python-version: 3.12
4040

41-
- name: Fetch west.yml from pull request
41+
- name: Fetch west.yml/Maintainer.yml from pull request
4242
if: >
4343
github.event_name == 'pull_request_target'
4444
run: |
4545
git fetch origin pull/${{ github.event.pull_request.number }}/merge
4646
git show FETCH_HEAD:west.yml > pr_west.yml
47+
git show FETCH_HEAD:MAINTAINERS.yml > pr_MAINTAINERS.yml
4748
4849
- name: west setup
4950
if: >
@@ -62,7 +63,7 @@ jobs:
6263
FLAGS+=" -r ${{ github.event.repository.name }}"
6364
FLAGS+=" -M MAINTAINERS.yml"
6465
if [ "${{ github.event_name }}" = "pull_request_target" ]; then
65-
FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml"
66+
FLAGS+=" -P ${{ github.event.pull_request.number }} --updated-manifest pr_west.yml --updated-maintainer-file pr_MAINTAINERS.yml"
6667
elif [ "${{ github.event_name }}" = "issues" ]; then
6768
FLAGS+=" -I ${{ github.event.issue.number }}"
6869
elif [ "${{ github.event_name }}" = "schedule" ]; then
@@ -71,4 +72,13 @@ jobs:
7172
echo "Unknown event: ${{ github.event_name }}"
7273
exit 1
7374
fi
74-
python3 scripts/set_assignees.py $FLAGS
75+
python3 scripts/ci/set_assignees.py $FLAGS
76+
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/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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,23 +189,23 @@ jobs:
189189
190190
- name: Upload Unit Test Results in HTML
191191
if: always()
192-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
192+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
193193
with:
194194
name: HTML Unit Test Results
195195
if-no-files-found: ignore
196196
path: |
197197
junit.html
198198
199199
- name: Publish Unit Test Results
200-
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
200+
uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
201201
with:
202202
check_name: Bsim Test Results
203203
files: "junit.xml"
204204
comment_mode: off
205205

206206
- name: Upload Event Details
207207
if: always()
208-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
208+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
209209
with:
210210
name: event
211211
path: |

.github/workflows/bug_snapshot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
echo "BUGS_PICKLE_PATH=${BUGS_PICKLE_PATH}" >> ${GITHUB_ENV}
5252
5353
- name: Configure AWS Credentials
54-
uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0
54+
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
5555
with:
5656
aws-access-key-id: ${{ vars.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_ACCESS_KEY_ID }}
5757
aws-secret-access-key: ${{ secrets.AWS_BUILDS_ZEPHYR_BUG_SNAPSHOT_SECRET_ACCESS_KEY }}

.github/workflows/clang.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
124124
- name: Upload Unit Test Results
125125
if: always()
126-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
126+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
127127
with:
128128
name: Unit Test Results (Subset ${{ matrix.subset }})
129129
path: |
@@ -146,7 +146,7 @@ jobs:
146146
persist-credentials: false
147147

148148
- name: Download Artifacts
149-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
149+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
150150
with:
151151
path: artifacts
152152

@@ -168,15 +168,15 @@ jobs:
168168
169169
- name: Upload Unit Test Results in HTML
170170
if: always()
171-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
171+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
172172
with:
173173
name: HTML Unit Test Results
174174
if-no-files-found: ignore
175175
path: |
176176
junit-clang.html
177177
178178
- name: Publish Unit Test Results
179-
uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
179+
uses: EnricoMi/publish-unit-test-result-action@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
180180
if: always()
181181
with:
182182
check_name: Unit Test Results

.github/workflows/codecov.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
127127
- name: Upload Doxygen Coverage Results
128128
if: matrix.platform == 'unit_testing'
129-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
129+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
130130
with:
131131
name: doxygen-coverage-results
132132
path: |
@@ -145,7 +145,7 @@ jobs:
145145
146146
- name: Upload Coverage Results
147147
if: always()
148-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
148+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
149149
with:
150150
name: Coverage Data (Subset ${{ matrix.normalized }})
151151
path: |
@@ -177,7 +177,7 @@ jobs:
177177
pip install -r scripts/requirements-actions.txt --require-hashes
178178
179179
- name: Download Artifacts
180-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
180+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
181181
with:
182182
path: coverage/reports
183183

@@ -242,7 +242,7 @@ jobs:
242242
243243
- name: Upload Merged Coverage Results and Report
244244
if: always()
245-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
245+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
246246
with:
247247
name: Coverage Data and report
248248
path: |

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040

4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
42+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
4343
with:
4444
languages: ${{ matrix.language }}
4545
build-mode: ${{ matrix.build-mode }}
@@ -53,6 +53,6 @@ jobs:
5353
exit 0
5454
5555
- name: Perform CodeQL Analysis
56-
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
56+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
5757
with:
5858
category: "/language:${{matrix.language}}"

.github/workflows/compliance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ jobs:
9191
./scripts/ci/check_compliance.py --annotate $excludes -c origin/${BASE_REF}..
9292
9393
- name: upload-results
94-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
94+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9595
continue-on-error: true
9696
with:
9797
name: compliance.xml
9898
path: compliance.xml
9999

100100
- name: Upload dts linter patch
101-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
101+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
102102
continue-on-error: true
103103
if: hashFiles('dts_linter.patch') != ''
104104
with:

0 commit comments

Comments
 (0)