Skip to content

Commit c34da05

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into remdzi/fix-driver-dma-uart-mcux-flexcomm
2 parents 0370791 + 12d21df commit c34da05

File tree

4,007 files changed

+124833
-36897
lines changed

Some content is hidden

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

4,007 files changed

+124833
-36897
lines changed

.github/workflows/assigner.yml

Lines changed: 5 additions & 3 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,7 +20,7 @@ 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:
@@ -39,8 +39,10 @@ jobs:
3939
python-version: 3.12
4040

4141
- name: Fetch west.yml from pull request
42+
if: >
43+
github.event_name == 'pull_request_target'
4244
run: |
43-
git fetch origin pull/${{ github.event.pull_request.number }}/head
45+
git fetch origin pull/${{ github.event.pull_request.number }}/merge
4446
git show FETCH_HEAD:west.yml > pr_west.yml
4547
4648
- name: west setup

.github/workflows/bsim-tests.yaml

Lines changed: 9 additions & 5 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.4.20250818
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
@@ -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: |

.github/workflows/bug_snapshot.yaml

Lines changed: 1 addition & 2 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,7 +19,7 @@ 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

.github/workflows/clang.yaml

Lines changed: 6 additions & 2 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.4.20250818
21+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
2222
options: '--entrypoint /bin/bash'
2323
strategy:
2424
fail-fast: 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}
@@ -159,7 +163,7 @@ jobs:
159163
160164
- name: Merge Test Results
161165
run: |
162-
junitparser merge --glob 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

.github/workflows/codecov.yaml

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
name: Code Coverage with codecov
22

33
on:
4-
schedule:
5-
- cron: '25 06,18 * * *'
4+
push:
5+
branches:
6+
- main
7+
- v*-branch
8+
- collab-*
69

710
permissions:
811
contents: read
@@ -17,7 +20,7 @@ jobs:
1720
runs-on:
1821
group: zephyr-runner-v2-linux-x64-4xlarge
1922
container:
20-
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.4.20250818
23+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
2124
options: '--entrypoint /bin/bash'
2225
strategy:
2326
fail-fast: false
@@ -112,6 +115,24 @@ jobs:
112115
-T tests --coverage-tool gcovr -xCONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano \
113116
--timeout-multiplier 2
114117
118+
- name: Build Doxygen Coverage
119+
if: matrix.platform == 'unit_testing'
120+
run: |
121+
pip install -r doc/requirements.txt --require-hashes
122+
sudo apt-get update
123+
sudo apt-get install -y graphviz # dot is needed but currently missing from the Docker image
124+
cmake -B doc/_build -S doc
125+
cmake --build doc/_build --target doxygen-coverage
126+
127+
- name: Upload Doxygen Coverage Results
128+
if: matrix.platform == 'unit_testing'
129+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
130+
with:
131+
name: doxygen-coverage-results
132+
path: |
133+
doc/_build/new.info
134+
doc/_build/coverage-report
135+
115136
- name: Print ccache stats
116137
if: always()
117138
run: |
@@ -230,7 +251,7 @@ jobs:
230251
coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.json
231252
coverage/reports/coverage-report-${{ steps.run_date.outputs.run_date_short }}.xlsx
232253
233-
- name: Upload coverage to Codecov
254+
- name: Upload test coverage to Codecov
234255
if: always()
235256
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
236257
with:
@@ -240,3 +261,15 @@ jobs:
240261
token: ${{ secrets.CODECOV_TOKEN }}
241262
files: coverage/reports/merged.xml
242263
flags: unittests-coverage
264+
265+
- name: Upload Doxygen coverage to Codecov
266+
if: always()
267+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
268+
with:
269+
env_vars: OS,PYTHON
270+
fail_ci_if_error: false
271+
verbose: true
272+
token: ${{ secrets.CODECOV_TOKEN }}
273+
files: coverage/reports/doxygen-coverage-results/new.info
274+
disable_search: true
275+
flags: doxygen-coverage

.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@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
42+
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
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@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
56+
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
5757
with:
5858
category: "/language:${{matrix.language}}"

.github/workflows/compliance.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
exit 1;
9393
fi
9494
95-
warns=("ClangFormat")
95+
warns=("ClangFormat" "LicenseAndCopyrightCheck")
9696
files=($(./scripts/ci/check_compliance.py -l))
9797
9898
for file in "${files[@]}"; do
@@ -117,8 +117,3 @@ jobs:
117117
echo "You can run this step locally with the ./scripts/ci/check_compliance.py script."
118118
exit 1;
119119
fi
120-
121-
if [ "${{ steps.pr_description.outcome }}" == "failure" ]; then
122-
echo "PR description cannot be empty"
123-
exit 1;
124-
fi

0 commit comments

Comments
 (0)