Skip to content

Commit 4d5d028

Browse files
ndrs-pstndrs-pst
committed
merge: 'upstream' into pst-v4.3.99 zephyrproject-rtos#61
# Conflicts: # drivers/counter/counter_stm32_rtc.c # drivers/rtc/rtc_stm32.c # drivers/serial/uart_infineon_pdl.c # drivers/spi/spi_infineon_pdl.c # drivers/watchdog/wdt_nxp_fs26.c # subsys/modbus/modbus_serial.c # west.yml
2 parents b2be029 + ba04734 commit 4d5d028

228 files changed

Lines changed: 11939 additions & 2025 deletions

File tree

Some content is hidden

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

‎.github/workflows/assigner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Check out source code
31-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
fetch-depth: 0
3434
persist-credentials: false

‎.github/workflows/backport_issue_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Check out source code
29-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030

3131
- name: Set up Python
3232
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Download artifacts
22-
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
22+
uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
2323
with:
2424
run_id: ${{ github.event.workflow_run.id }}
2525

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
7575
7676
- name: Checkout
77-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
77+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7878
with:
7979
fetch-depth: 0
8080

@@ -102,7 +102,7 @@ jobs:
102102
pip install -r scripts/requirements-actions.txt --require-hashes
103103
104104
- name: Check common triggering files
105-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
105+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
106106
id: check-common-files
107107
with:
108108
files: |
@@ -121,7 +121,7 @@ jobs:
121121
modules/hal_nordic/**
122122
123123
- name: Check if Bluethooth files changed
124-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
124+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
125125
id: check-bluetooth-files
126126
with:
127127
files: |
@@ -131,7 +131,7 @@ jobs:
131131
tests/bsim/bluetooth/
132132
133133
- name: Check if Networking files changed
134-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
134+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
135135
id: check-networking-files
136136
with:
137137
files: |
@@ -144,7 +144,7 @@ jobs:
144144
include/zephyr/net/ieee802154*
145145
146146
- name: Check if UART files changed
147-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
147+
uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v47.0.1
148148
id: check-uart-files
149149
with:
150150
files: |
@@ -189,23 +189,23 @@ jobs:
189189
190190
- name: Upload Unit Test Results in HTML
191191
if: always()
192-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
192+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
200+
uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
208+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
209209
with:
210210
name: event
211211
path: |

‎.github/workflows/bug_snapshot.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727

2828
- name: Set up Python
2929
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -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@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0
54+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708 # v5.1.1
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
5454
5555
- name: Checkout
56-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
56+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5757
with:
5858
fetch-depth: 0
5959
persist-credentials: false
@@ -123,7 +123,7 @@ jobs:
123123
124124
- name: Upload Unit Test Results
125125
if: always()
126-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
126+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
127127
with:
128128
name: Unit Test Results (Subset ${{ matrix.subset }})
129129
path: |
@@ -140,13 +140,13 @@ jobs:
140140
if: (success() || failure())
141141
steps:
142142
- name: Checkout
143-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
143+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
144144
with:
145145
fetch-depth: 0
146146
persist-credentials: false
147147

148148
- name: Download Artifacts
149-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
149+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
171+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
179+
uses: EnricoMi/publish-unit-test-result-action@27d65e188ec43221b20d26de30f4892fad91df2f # v2.22.0
180180
if: always()
181181
with:
182182
check_name: Unit Test Results

‎.github/workflows/codecov.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
6868
6969
- name: checkout
70-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
70+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7171
with:
7272
fetch-depth: 0
7373

@@ -126,7 +126,7 @@ jobs:
126126
127127
- name: Upload Doxygen Coverage Results
128128
if: matrix.platform == 'unit_testing'
129-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
129+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
148+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
149149
with:
150150
name: Coverage Data (Subset ${{ matrix.normalized }})
151151
path: |
@@ -161,7 +161,7 @@ jobs:
161161

162162
steps:
163163
- name: checkout
164-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
164+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
165165
with:
166166
fetch-depth: 0
167167

@@ -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@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
180+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
245+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
246246
with:
247247
name: Coverage Data and report
248248
path: |
@@ -253,7 +253,7 @@ jobs:
253253
254254
- name: Upload test coverage to Codecov
255255
if: always()
256-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
256+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
257257
with:
258258
env_vars: OS,PYTHON
259259
fail_ci_if_error: false
@@ -264,7 +264,7 @@ jobs:
264264

265265
- name: Upload Doxygen coverage to Codecov
266266
if: always()
267-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
267+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
268268
with:
269269
env_vars: OS,PYTHON
270270
fail_ci_if_error: false

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
config: ./.github/codeql/codeql-js-config.yml
3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4040

4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
42+
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
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@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
56+
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
5757
with:
5858
category: "/language:${{matrix.language}}"

‎.github/workflows/coding_guidelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Run coding guidelines checks on patch series (PR)
1212
steps:
1313
- name: Checkout the code
14-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
14+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515
with:
1616
ref: ${{ github.event.pull_request.head.sha }}
1717
fetch-depth: 0

‎.github/workflows/compliance.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
echo "$HOME/.local/bin" >> $GITHUB_PATH
2222
2323
- name: Checkout the code
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525
with:
2626
ref: ${{ github.event.pull_request.head.sha }}
2727
fetch-depth: 0
@@ -61,7 +61,7 @@ jobs:
6161
west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log
6262
6363
- name: Setup Node.js
64-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
64+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
6565
with:
6666
node-version: "lts/*"
6767
cache: npm
@@ -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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
94+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.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@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
101+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
102102
continue-on-error: true
103103
if: hashFiles('dts_linter.patch') != ''
104104
with:

0 commit comments

Comments
 (0)