Skip to content

Commit 7584905

Browse files
authored
Merge branch 'zephyrproject-rtos:main' into main
2 parents 2eb4f50 + 169fd6a commit 7584905

File tree

4,962 files changed

+171940
-46994
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,962 files changed

+171940
-46994
lines changed

.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/clang.yaml

Lines changed: 5 additions & 1 deletion
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}

.github/workflows/codecov.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on:
2121
group: zephyr-runner-v2-linux-x64-4xlarge
2222
container:
23-
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
2424
options: '--entrypoint /bin/bash'
2525
strategy:
2626
fail-fast: false

.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/doc-build.yml

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717
env:
1818
DOXYGEN_VERSION: 1.14.0
1919
DOXYGEN_MD5SUM: e761a5097ae20ecccfd02041925f102a
20-
JOB_COUNT: 4
20+
JOB_COUNT: 8
2121

2222
jobs:
2323
doc-file-check:
@@ -32,7 +32,7 @@ jobs:
3232
ref: ${{ github.event.pull_request.head.sha }}
3333
fetch-depth: 0
3434
- name: Check if Documentation related files changed
35-
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
35+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
3636
id: check-doc-files
3737
with:
3838
files: |
@@ -56,71 +56,75 @@ jobs:
5656
needs: [doc-file-check]
5757
if: >
5858
needs.doc-file-check.outputs.file_check == 'true' || github.event_name != 'pull_request'
59-
runs-on: ubuntu-24.04
60-
timeout-minutes: 90
59+
runs-on:
60+
group: zephyr-runner-v2-linux-x64-4xlarge
61+
container:
62+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
63+
options: '--entrypoint /bin/bash'
64+
timeout-minutes: 20
6165
concurrency:
6266
group: doc-build-html-${{ github.ref }}
6367
cancel-in-progress: true
68+
env:
69+
BASE_REF: ${{ github.base_ref }}
70+
6471

6572
steps:
66-
- name: install-pkgs
73+
74+
- name: Print cloud service information
6775
run: |
68-
sudo apt-get update
69-
sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
70-
wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
71-
echo "${DOXYGEN_MD5SUM} doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz" | md5sum -c
72-
if [ $? -ne 0 ]; then
73-
echo "Failed to verify doxygen tarball"
74-
exit 1
75-
fi
76-
sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
77-
echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
78-
echo "${HOME}/.local/bin" >> $GITHUB_PATH
76+
echo "ZEPHYR_RUNNER_CLOUD_PROVIDER = ${ZEPHYR_RUNNER_CLOUD_PROVIDER}"
77+
echo "ZEPHYR_RUNNER_CLOUD_NODE = ${ZEPHYR_RUNNER_CLOUD_NODE}"
78+
echo "ZEPHYR_RUNNER_CLOUD_POD = ${ZEPHYR_RUNNER_CLOUD_POD}"
7979
80-
- name: checkout
80+
- name: Apply container owner mismatch workaround
81+
run: |
82+
# FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
83+
# match the container user UID because of the way GitHub
84+
# Actions runner is implemented. Remove this workaround when
85+
# GitHub comes up with a fundamental fix for this problem.
86+
git config --global --add safe.directory ${GITHUB_WORKSPACE}
87+
88+
- name: Clone cached Zephyr repository
89+
continue-on-error: true
90+
run: |
91+
git clone --shared /repo-cache/zephyrproject/zephyr .
92+
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
93+
94+
- name: Checkout
8195
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8296
with:
8397
ref: ${{ github.event.pull_request.head.sha }}
8498
fetch-depth: 0
85-
path: zephyr
8699

87-
- name: Rebase
88-
if: github.event_name == 'pull_request'
89-
continue-on-error: true
90-
env:
91-
BASE_REF: ${{ github.base_ref }}
92-
PR_HEAD: ${{ github.event.pull_request.head.sha }}
93-
working-directory: zephyr
100+
- name: Environment Setup
94101
run: |
95-
git config --global user.email "[email protected]"
96-
git config --global user.name "Github Actions"
97-
rm -fr ".git/rebase-apply"
98-
rm -fr ".git/rebase-merge"
99-
git rebase origin/${BASE_REF}
100-
git clean -f -d
101-
git log --graph --oneline HEAD...${PR_HEAD}
102+
if [ "${{github.event_name}}" = "pull_request" ]; then
103+
git config --global user.email "[email protected]"
104+
git config --global user.name "Zephyr Builder"
105+
rm -fr ".git/rebase-apply"
106+
rm -fr ".git/rebase-merge"
107+
git rebase origin/${BASE_REF}
108+
git clean -f -d
109+
git log --pretty=oneline | head -n 10
110+
fi
111+
echo "$HOME/.local/bin" >> $GITHUB_PATH
112+
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
102113
103-
- name: Set up Python
104-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
105-
with:
106-
python-version: 3.12
107-
cache: pip
108-
cache-dependency-path: doc/requirements.txt
114+
west init -l . || true
115+
west config --global update.narrow true
116+
west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules ../bootloader ../tools && west update --path-cache /repo-cache/zephyrproject)
117+
west forall -c 'git reset --hard HEAD'
109118
110-
- name: Setup Zephyr project
111-
uses: zephyrproject-rtos/action-zephyr-setup@6a744370a22e4ecb24f5dda3c7e80ff3e0a3b847 # v1.0.8
112-
with:
113-
app-path: zephyr
114-
toolchains: 'all'
119+
echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
115120
116-
- name: install-pip
117-
working-directory: zephyr
121+
- name: Install Python packages required for documentation build
118122
run: |
123+
pip install -r scripts/requirements-actions.txt --require-hashes
119124
pip install -r doc/requirements.txt --require-hashes
120125
121-
- name: build-docs
126+
- name: Build HTML documentation
122127
shell: bash
123-
working-directory: zephyr
124128
run: |
125129
if [[ "$GITHUB_REF" =~ "refs/tags/v" ]]; then
126130
DOC_TAG="release"
@@ -145,27 +149,26 @@ jobs:
145149
lcov --remove doc-coverage.info \*/deprecated > new.info
146150
genhtml --no-function-coverage --no-branch-coverage new.info -o coverage-report
147151
148-
- name: compress-docs
149-
working-directory: zephyr
152+
- name: Compress documentation build artifacts
150153
run: |
151154
tar --use-compress-program="xz -T0" -cf html-output.tar.xz --exclude html/_sources --exclude html/doxygen/xml --directory=doc/_build html
152155
tar --use-compress-program="xz -T0" -cf api-output.tar.xz --directory=doc/_build html/doxygen/html
153156
tar --use-compress-program="xz -T0" -cf api-coverage.tar.xz coverage-report
154157
155-
- name: upload-build
158+
- name: Upload HTML output
156159
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
157160
with:
158161
name: html-output
159-
path: zephyr/html-output.tar.xz
162+
path: html-output.tar.xz
160163

161-
- name: upload-api-coverage
164+
- name: Upload Doxygen coverage artifacts
162165
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
163166
with:
164167
name: api-coverage
165-
path: zephyr/api-coverage.tar.xz
168+
path: api-coverage.tar.xz
166169

167170

168-
- name: process-pr
171+
- name: Summarize PR documentation URLs
169172
if: github.event_name == 'pull_request'
170173
run: |
171174
REPO_NAME="${{ github.event.repository.name }}"
@@ -179,7 +182,7 @@ jobs:
179182
echo "API Documentation will be available shortly at: ${API_DOC_URL}" >> $GITHUB_STEP_SUMMARY
180183
echo "API Coverage Report will be available shortly at: ${API_COVERAGE_URL}" >> $GITHUB_STEP_SUMMARY
181184
182-
- name: upload-pr-number
185+
- name: Upload PR number
183186
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
184187
if: github.event_name == 'pull_request'
185188
with:
@@ -227,10 +230,11 @@ jobs:
227230
echo "/opt/doxygen-${DOXYGEN_VERSION}/bin" >> $GITHUB_PATH
228231
229232
- name: Setup Zephyr project
230-
uses: zephyrproject-rtos/action-zephyr-setup@6a744370a22e4ecb24f5dda3c7e80ff3e0a3b847 # v1.0.8
233+
uses: zephyrproject-rtos/action-zephyr-setup@c125c5ebeeadbd727fa740b407f862734af1e52a # v1.0.9
231234
with:
232235
app-path: zephyr
233236
toolchains: 'arm-zephyr-eabi'
237+
enable-ccache: false
234238

235239
- name: install-pip-pkgs
236240
working-directory: zephyr

.github/workflows/errno.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,24 @@ permissions:
1313
jobs:
1414
check-errno:
1515
runs-on: ubuntu-24.04
16-
container:
17-
image: ghcr.io/zephyrproject-rtos/ci:v0.28.4
18-
1916
steps:
20-
- name: Apply container owner mismatch workaround
21-
run: |
22-
# FIXME: The owner UID of the GITHUB_WORKSPACE directory may not
23-
# match the container user UID because of the way GitHub
24-
# Actions runner is implemented. Remove this workaround when
25-
# GitHub comes up with a fundamental fix for this problem.
26-
git config --global --add safe.directory ${GITHUB_WORKSPACE}
27-
2817
- name: checkout
2918
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
19+
with:
20+
path: zephyr
3021

31-
- name: Environment Setup
32-
run: |
33-
echo "ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-$( cat SDK_VERSION )" >> $GITHUB_ENV
22+
- name: Setup Zephyr project
23+
uses: zephyrproject-rtos/action-zephyr-setup@c125c5ebeeadbd727fa740b407f862734af1e52a # v1.0.9
24+
with:
25+
app-path: zephyr
26+
toolchains: 'arm-zephyr-eabi'
27+
west-group-filter: -hal,-tools,-bootloader,-babblesim
28+
west-project-filter: -nrf_hw_models
29+
enable-ccache: false
3430

3531
- name: Run errno.py
32+
working-directory: zephyr
3633
run: |
34+
export ZEPHYR_SDK_INSTALL_DIR=${{ github.workspace }}/zephyr-sdk
3735
export ZEPHYR_BASE=${PWD}
3836
./scripts/ci/errno.py

.github/workflows/footprint-tracking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
group: zephyr-runner-v2-linux-x64-4xlarge
2929
if: github.repository_owner == 'zephyrproject-rtos'
3030
container:
31-
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.4.20250818
31+
image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.28.6.20251003
3232
options: '--entrypoint /bin/bash'
3333
defaults:
3434
run:

.github/workflows/greet_first_time_contributor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
and update (by amending and force-pushing the commits) your pull request if necessary.
4646
4747
If you are stuck or need help please join us on [Discord](https://chat.zephyrproject.org/)
48-
and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-review-escalation)
48+
and ask your question there. Additionally, you can [escalate the review](https://docs.zephyrproject.org/latest/contribute/contributor_expectations.html#pr-technical-escalation)
4949
when applicable. 😊
5050
5151
pr-merged-message: >

.github/workflows/hello_world_multiplatform.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-14, windows-2022]
31+
os: [ubuntu-22.04, ubuntu-24.04, ubuntu-24.04-arm, macos-14, windows-2022]
3232
runs-on: ${{ matrix.os }}
3333
steps:
3434
- name: Checkout
@@ -59,10 +59,11 @@ jobs:
5959
python-version: 3.12
6060

6161
- name: Setup Zephyr project
62-
uses: zephyrproject-rtos/action-zephyr-setup@6a744370a22e4ecb24f5dda3c7e80ff3e0a3b847 # v1.0.8
62+
uses: zephyrproject-rtos/action-zephyr-setup@c125c5ebeeadbd727fa740b407f862734af1e52a # v1.0.9
6363
with:
6464
app-path: zephyr
6565
toolchains: aarch64-zephyr-elf:arc-zephyr-elf:arc64-zephyr-elf:arm-zephyr-eabi:mips-zephyr-elf:riscv64-zephyr-elf:sparc-zephyr-elf:x86_64-zephyr-elf:xtensa-dc233c_zephyr-elf:xtensa-sample_controller32_zephyr-elf:rx-zephyr-elf
66+
ccache-cache-key: hw-${{ matrix.os }}
6667

6768
- name: Build firmware
6869
working-directory: zephyr

.github/workflows/pinned-gh-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
- name: Checkout code
1717
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
- name: Ensure SHA pinned actions
19-
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@fc87bb5b5a97953d987372e74478de634726b3e5 # v3.0.25
19+
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@9e9574ef04ea69da568d6249bd69539ccc704e74 # v4.0.0

0 commit comments

Comments
 (0)