Skip to content

Commit 6a41f91

Browse files
authored
Merge branch 'apache:master' into dev-issue-17321
2 parents be7f4b3 + 62629d5 commit 6a41f91

536 files changed

Lines changed: 18064 additions & 12804 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/build.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
run: tar zcf sources.tar.gz sources
117117

118118
- name: Archive Source Bundle
119-
uses: actions/upload-artifact@v7.0.0
119+
uses: actions/upload-artifact@v7.0.1
120120
with:
121121
name: source-bundle
122122
path: sources.tar.gz
@@ -206,7 +206,8 @@ jobs:
206206
cd /github/workspace/nuttx-ntfc
207207
# get NTFC test cases
208208
cd external
209-
git clone -b release-0.0.1 https://github.com/szafonimateusz-mi/nuttx-testing
209+
git clone -b release-0.0.1 https://github.com/apache/nuttx-ntfc-testing
210+
mv nuttx-ntfc-testing nuttx-testing
210211
export NTFCDIR=/github/workspace/nuttx-ntfc
211212
212213
echo "::add-matcher::sources/nuttx/.github/gcc.json"
@@ -231,7 +232,7 @@ jobs:
231232
if: always()
232233
run: df -h
233234

234-
- uses: actions/upload-artifact@v7.0.0
235+
- uses: actions/upload-artifact@v7.0.1
235236
if: ${{ always() }}
236237
with:
237238
name: linux-${{matrix.boards}}-builds
@@ -276,7 +277,7 @@ jobs:
276277
cd sources/nuttx
277278
./tools/ci/cibuild-oot.sh
278279
279-
- uses: actions/upload-artifact@v7.0.0
280+
- uses: actions/upload-artifact@v7.0.1
280281
if: ${{ always() }}
281282
with:
282283
name: oot-build-artifacts
@@ -337,7 +338,7 @@ jobs:
337338
cd sources/nuttx/tools/ci
338339
./cibuild.sh -i -c -A -R testlist/${{matrix.boards}}.dat
339340
340-
- uses: actions/upload-artifact@v7.0.0
341+
- uses: actions/upload-artifact@v7.0.1
341342
with:
342343
name: macos-${{matrix.boards}}-builds
343344
path: buildartifacts/
@@ -420,7 +421,7 @@ jobs:
420421
cd sources/nuttx/tools/ci
421422
./cibuild.sh -g -i -A -C -N -R testlist/${{matrix.boards}}.dat
422423
423-
- uses: actions/upload-artifact@v7.0.0
424+
- uses: actions/upload-artifact@v7.0.1
424425
with:
425426
name: msys2-${{matrix.boards}}-builds
426427
path: buildartifacts/
@@ -451,8 +452,6 @@ jobs:
451452
run: |
452453
pip install kconfiglib
453454
454-
- run: git config --global core.autocrlf false
455-
456455
- name: Download Source Artifact
457456
uses: actions/download-artifact@v8
458457
with:
@@ -467,12 +466,14 @@ jobs:
467466
- name: Run Builds
468467
run: |
469468
"ARTIFACTDIR=${{github.workspace}}\sources\buildartifacts" >> $env:GITHUB_ENV
469+
git config --global core.autocrlf false
470+
git config --global core.longpaths true
470471
git config --global --add safe.directory ${{github.workspace}}\sources\nuttx
471472
git config --global --add safe.directory ${{github.workspace}}\sources\apps
472473
cd sources\nuttx\tools\ci
473474
.\cibuild.ps1 -n -i -A -C -N testlist\windows.dat
474475
475-
- uses: actions/upload-artifact@v7.0.0
476+
- uses: actions/upload-artifact@v7.0.1
476477
with:
477478
name: msvc-builds
478479
path: ./sources/buildartifacts/

.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
pip3 install pipenv
4848
pipenv install
4949
pipenv run make html
50-
- uses: actions/upload-artifact@v7.0.0
50+
- uses: actions/upload-artifact@v7.0.1
5151
with:
5252
name: sphinx-docs
5353
path: |

.github/workflows/issue_labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
issues: write
2424
steps:
2525
- name: Add labels issues automatically based on their body.
26-
uses: actions/github-script@v8
26+
uses: actions/github-script@v9.0.0
2727
with:
2828
script: |
2929
const body = context.payload.issue.body;

.github/workflows/labeler.yml

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

4646
# Fetch the updated PR filenames. Compute the Size Label and Arch Labels.
4747
- name: Compute PR labels
48-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
48+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
4949
with:
5050
github-token: ${{ secrets.GITHUB_TOKEN }}
5151
script: |
@@ -144,7 +144,7 @@ jobs:
144144
145145
# Upload the PR Artifact as pr.zip
146146
- name: Upload PR artifact
147-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
147+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
148148
with:
149149
name: pr
150150
path: pr/

.github/workflows/pr_labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
steps:
3939
# Download the PR Artifact, containing PR Number and PR Labels
4040
- name: Download PR artifact
41-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
41+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
4242
with:
4343
script: |
4444
const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -64,7 +64,7 @@ jobs:
6464

6565
# Write the PR Labels into the PR
6666
- name: Write PR labels
67-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
67+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
6868
with:
6969
github-token: ${{ secrets.GITHUB_TOKEN }}
7070
script: |

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.dSYM
1010
*.elf
1111
*.exe
12+
etctmp/
1213
*.gcno
1314
*.gcda
1415
*.hex
@@ -55,6 +56,7 @@
5556
/_SAVED_APPS_config
5657
/cscope.*
5758
/defconfig
59+
/defconfig.tmp.bak
5860
/Make.defs
5961
/nuttx
6062
/nuttx32

CMakeLists.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ endif()
5555

5656
# Find Python 3 interpreter
5757

58-
find_package(Python3 REQUIRED COMPONENTS Interpreter)
58+
find_package(
59+
Python3 REQUIRED
60+
COMPONENTS Interpreter
61+
QUIET)
5962
if(NOT Python3_Interpreter_FOUND)
6063
message(FATAL_ERROR "Did NOT find Python interpreter.")
6164
endif()
@@ -227,6 +230,16 @@ set(ENV{HOST_OTHER} n)
227230

228231
include(nuttx_sethost)
229232

233+
option(NXTMPDIR "Create the nxtmpdir folder for third-party packages." OFF)
234+
235+
include(nuttx_3rdparty)
236+
237+
if(NXTMPDIR)
238+
nuttx_make_nxtmpdir()
239+
else()
240+
nuttx_remove_nxtmpdir()
241+
endif()
242+
230243
include(nuttx_parse_function_args)
231244
include(nuttx_add_subdirectory)
232245
include(nuttx_create_symlink)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _coremark:
2+
13
===============================
24
``coremark`` CoreMark Benchmark
35
===============================
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
=========================================
22
``mbedtls`` Mbed TLS Cryptography Library
33
=========================================
4+
5+
NuttX can build the Mbed TLS cryptography library from ``nuttx-apps`` (under
6+
``apps/crypto/mbedtls``). Enable ``CONFIG_CRYPTO_MBEDTLS`` in ``menuconfig`` and
7+
select application options as needed.
8+
9+
Mbed TLS is commonly used for TLS clients and servers on NuttX. For MQTT over TLS
10+
with the MQTT-C integration, enable ``CONFIG_CRYPTO_MBEDTLS`` and
11+
``CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS``; see :doc:`../../netutils/mqttc/index`.

Documentation/applications/examples/lvgldemo/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _lvgldemo:
2+
13
======================
24
``lvgldemo`` LVGL Demo
35
======================

0 commit comments

Comments
 (0)