Skip to content

Commit e3a223e

Browse files
authored
Merge branch 'RT-Thread:master' into master
2 parents 574e137 + 9b05fc5 commit e3a223e

5,473 files changed

Lines changed: 887379 additions & 1031117 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.

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update
99

1010
RUN apt-get upgrade -y
1111

12-
RUN apt-get install -y vim git wget python3 python-is-python3 pip gcc-arm-none-eabi scons libncurses5-dev
12+
RUN apt-get install -y vim git wget python3 python-is-python3 pip gcc-arm-none-eabi libncurses5-dev
1313

1414
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y qemu-system-arm
1515

@@ -34,7 +34,7 @@ RUN git clone https://github.com/RT-Thread/packages.git /root/.env/packages/pack
3434

3535
ENV PATH="/root/.env/tools/scripts:$PATH"
3636

37-
RUN pip install requests psutil kconfiglib tqdm -qq
37+
RUN pip install scons requests psutil kconfiglib tqdm -qq
3838

3939
ENV RTT_EXEC_PATH=/usr/bin
4040

.gitee/PULL_REQUEST_TEMPLATE.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ As part of this pull request, I've considered the following:
2727
- [ ] All modifications to BSP are justified and do not affect other components or BSPs.
2828
- [ ] I've commented appropriately where code is tricky.
2929
- [ ] Code in this PR is of high quality.
30-
- [ ] This PR complies with [RT-Thread code specification](https://gitee.com/rtthread/rt-thread/blob/master/documentation/contribution_guide/coding_style_en.md)
30+
- [ ] This PR complies with [RT-Thread code specification](https://gitee.com/rtthread/rt-thread/blob/master/documentation/7.contribution/coding_style_en.md)

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
- [ ] 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或
2828
- [ ] 对难懂代码均提供对应的注释
2929
- [ ] 本拉取/合并请求代码是高质量的
30-
- [ ] 本拉取/合并符合[RT-Thread代码规范](https://gitee.com/rtthread/rt-thread/blob/master/documentation/contribution_guide/coding_style_cn.md)
30+
- [ ] 本拉取/合并符合[RT-Thread代码规范](https://gitee.com/rtthread/rt-thread/blob/master/documentation/7.contribution/coding_style_cn.md)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ The following content must not be changed in the submitted PR message. Otherwise
6161
- [ ] 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
6262
- [ ] 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
6363
- [ ] 代码是高质量的 Code in this PR is of high quality
64-
- [ ] 已经使用[formatting](https://github.com/mysterywolf/formatting) 等源码格式化工具确保格式符合[RT-Thread代码规范](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_cn.md) This PR complies with [RT-Thread code specification](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_en.md)
64+
- [ ] 已经使用[formatting](https://github.com/mysterywolf/formatting) 等源码格式化工具确保格式符合[RT-Thread代码规范](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_cn.md) This PR complies with [RT-Thread code specification](https://github.com/RT-Thread/rt-thread/blob/master/documentation/contribution_guide/coding_style_en.md)
65+
- [ ] 如果是新增bsp, 已经添加ci检查到[.github/workflows/bsp_buildings.yml](workflows/bsp_buildings.yml) 详细请参考链接[BSP自查](https://www.rt-thread.org/document/site/#/rt-thread-version/rt-thread-standard/development-guide/bsp-selfcheck/bsp_selfcheck)

.github/labeler.yml

Lines changed: 155 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,169 @@ Component:
7272
- changed-files:
7373
- any-glob-to-any-file: components/**
7474

75+
RT-Smart:
76+
- changed-files:
77+
- any-glob-to-any-file: components/lwp/**
78+
7579
'component: lwp':
7680
- changed-files:
77-
- any-glob-to-any-file: components/lwp**
81+
- any-glob-to-any-file: components/lwp/**
7882

7983
'component: dfsv1':
8084
- changed-files:
81-
- any-glob-to-any-file: components/dfs_v1**
85+
- any-glob-to-any-file: components/dfs_v1/**
8286

8387
'component: dfsv2':
8488
- changed-files:
85-
- any-glob-to-any-file: components/dfs_v2**
89+
- any-glob-to-any-file: components/dfs_v2/**
90+
91+
'component: net':
92+
- changed-files:
93+
- any-glob-to-any-file: components/net/**
94+
95+
'component: net/at':
96+
- changed-files:
97+
- any-glob-to-any-file: components/net/at/**
98+
99+
'component: net/lwip':
100+
- changed-files:
101+
- any-glob-to-any-file: components/net/lwip/**
102+
103+
'component: net/netdev':
104+
- changed-files:
105+
- any-glob-to-any-file: components/net/netdev/**
106+
107+
'component: net/sal':
108+
- changed-files:
109+
- any-glob-to-any-file: components/net/sal/**
110+
111+
'component: drivers':
112+
- changed-files:
113+
- any-glob-to-any-file: components/drivers/**
114+
115+
'component: drivers/audio':
116+
- changed-files:
117+
- any-glob-to-any-file: components/drivers/audio/**
118+
119+
'component: drivers/can':
120+
- changed-files:
121+
- any-glob-to-any-file: components/drivers/can/**
122+
123+
'component: drivers/clk':
124+
- changed-files:
125+
- any-glob-to-any-file: components/drivers/clk/**
126+
127+
'component: drivers/core':
128+
- changed-files:
129+
- any-glob-to-any-file: components/drivers/core/**
130+
131+
'component: drivers/cputime':
132+
- changed-files:
133+
- any-glob-to-any-file: components/drivers/cputime/**
134+
135+
'component: drivers/graphic':
136+
- changed-files:
137+
- any-glob-to-any-file: components/drivers/graphic/**
138+
139+
'component: drivers/hwcrypto':
140+
- changed-files:
141+
- any-glob-to-any-file: components/drivers/hwcrypto/**
142+
143+
'component: drivers/hwtimer':
144+
- changed-files:
145+
- any-glob-to-any-file: components/drivers/hwtimer/**
146+
147+
'component: drivers/i2c':
148+
- changed-files:
149+
- any-glob-to-any-file: components/drivers/i2c/**
150+
151+
'component: drivers/ipc':
152+
- changed-files:
153+
- any-glob-to-any-file: components/drivers/ipc/**
154+
155+
'component: drivers/ktime':
156+
- changed-files:
157+
- any-glob-to-any-file: components/drivers/ktime/**
158+
159+
'component: drivers/misc':
160+
- changed-files:
161+
- any-glob-to-any-file: components/drivers/misc/**
162+
163+
'component: drivers/mtd':
164+
- changed-files:
165+
- any-glob-to-any-file: components/drivers/mtd/**
166+
167+
'component: drivers/ofw':
168+
- changed-files:
169+
- any-glob-to-any-file: components/drivers/ofw/**
170+
171+
'component: drivers/pci':
172+
- changed-files:
173+
- any-glob-to-any-file: components/drivers/pci/**
174+
175+
'component: drivers/phy':
176+
- changed-files:
177+
- any-glob-to-any-file: components/drivers/phy/**
178+
179+
'component: drivers/pic':
180+
- changed-files:
181+
- any-glob-to-any-file: components/drivers/pic/**
182+
183+
'component: drivers/pinctrl':
184+
- changed-files:
185+
- any-glob-to-any-file: components/drivers/pinctrl/**
186+
187+
'component: drivers/pm':
188+
- changed-files:
189+
- any-glob-to-any-file: components/drivers/pm/**
190+
191+
'component: drivers/rtc':
192+
- changed-files:
193+
- any-glob-to-any-file: components/drivers/rtc/**
194+
195+
'component: drivers/sdio':
196+
- changed-files:
197+
- any-glob-to-any-file: components/drivers/sdio/**
198+
199+
'component: drivers/sensor_v1':
200+
- changed-files:
201+
- any-glob-to-any-file: components/drivers/sensor/v1/**
202+
203+
'component: drivers/sensor_v2':
204+
- changed-files:
205+
- any-glob-to-any-file: components/drivers/sensor/v2/**
206+
207+
'component: drivers/serial':
208+
- changed-files:
209+
- any-glob-to-any-file: components/drivers/serial/**
210+
211+
'component: drivers/spi':
212+
- changed-files:
213+
- any-glob-to-any-file: components/drivers/spi/**
214+
215+
'component: drivers/touch':
216+
- changed-files:
217+
- any-glob-to-any-file: components/drivers/touch/**
218+
219+
'component: drivers/usb':
220+
- changed-files:
221+
- any-glob-to-any-file: components/drivers/usb/**
222+
223+
'component: drivers/virtio':
224+
- changed-files:
225+
- any-glob-to-any-file: components/drivers/virtio/**
226+
227+
'component: drivers/watchdog':
228+
- changed-files:
229+
- any-glob-to-any-file: components/drivers/watchdog/**
230+
231+
'component: drivers/wlan':
232+
- changed-files:
233+
- any-glob-to-any-file: components/drivers/wlan/**
234+
235+
'component: finsh':
236+
- changed-files:
237+
- any-glob-to-any-file: components/finsh/**
86238

87239
libcpu:
88240
- changed-files:

.github/utest/cpp11/cpp11.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CONFIG_UTEST_CPP11_THREAD_TC=y
2+
# dependencies
3+
CONFIG_RT_USING_CI_ACTION=y
4+
CONFIG_RT_USING_CPLUSPLUS=y
5+
CONFIG_RT_USING_CPLUSPLUS11=y

.github/utest/default.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_RT_USING_CI_ACTION=y
2+
CONFIG_RT_CONSOLEBUF_SIZE=1024

.github/utest/rtsmart/rtsmart.cfg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG_UTEST_MEMHEAP_TC=y
2+
3+
# dependencies
4+
CONFIG_RT_USING_SMART=y
5+
CONFIG_RT_USING_MEMHEAP=y
6+
CONFIG_RT_USING_DFS_V2=y

.github/utest/smp/smp.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CONFIG_RT_USING_SMP=y
2+
# dependencies
3+
CONFIG_SYSTEM_THREAD_STACK_SIZE=4096

.github/workflows/action_tools.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,17 @@ on:
2626
- '**/*.c'
2727
- '**/*.h'
2828
- '**/*.cpp'
29+
workflow_dispatch:
30+
repository_dispatch:
2931

3032
permissions:
3133
contents: read # to fetch code (actions/checkout)
3234

3335
jobs:
3436
test:
35-
runs-on: ubuntu-latest
37+
runs-on: ubuntu-22.04
3638
name: Tools
37-
if: github.repository_owner == 'RT-Thread' && false
39+
if: github.repository_owner == 'RT-Thread'
3840
strategy:
3941
fail-fast: false
4042
env:
@@ -60,7 +62,12 @@ jobs:
6062
6163
- name: Build Tools
6264
run: |
63-
scons --pyconfig-silent -C $TEST_BSP_ROOT
65+
scons --pyconfig-silent -C $TEST_BSP_ROOT 2>menuconfig.log
66+
cat menuconfig.log
67+
if grep -q "warning:" menuconfig.log; then
68+
echo "Errors found in menuconfig, failing the build."
69+
exit 1
70+
fi
6471
scons -j$(nproc) -C $TEST_BSP_ROOT
6572
6673
- name: Project generate Tools

0 commit comments

Comments
 (0)