Skip to content

Commit 5c7ee28

Browse files
authored
[action/ci] pkgs --update-force instead of pkgs --update (RT-Thread#10042)
* [action/ci] pkgs --update-force instead of pkgs --update * Update bsp_buildings.yml * l4 单独拉出来
1 parent c3cfe6a commit 5c7ee28

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/bsp_buildings.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- "hc32l136"
110110
- "yichip/yc3121-pos"
111111
- "fm33lc026"
112-
- RTT_BSP: "stm32l4_f0_f1"
112+
- RTT_BSP: "stm32l4"
113113
RTT_TOOL_CHAIN: "sourcery-arm"
114114
SUB_RTT_BSP:
115115
- "stm32/stm32l4r5-st-nucleo"
@@ -130,6 +130,9 @@ jobs:
130130
- "stm32/stm32l496-ali-developer"
131131
- "stm32/stm32l496-st-nucleo"
132132
- "stm32/stm32l496-st-discovery"
133+
- RTT_BSP: "stm32f0_f1"
134+
RTT_TOOL_CHAIN: "sourcery-arm"
135+
SUB_RTT_BSP:
133136
- "stm32/stm32f072-st-nucleo"
134137
- "stm32/stm32f091-st-nucleo"
135138
- "stm32/stm32f103-100ask-mini"
@@ -349,7 +352,7 @@ jobs:
349352
- "raspberry-pi/raspi3-64"
350353
- "raspberry-pi/raspi4-64"
351354
#- "rockchip/rk3568" too long
352-
- "phytium/aarch64"
355+
#- "phytium/aarch64" too long
353356
- RTT_BSP: "riscv-none"
354357
RTT_TOOL_CHAIN: "sourcery-riscv-none-embed"
355358
SUB_RTT_BSP:

tools/ci/bsp_buildings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def build_bsp(bsp, scons_args=''):
6262
run_cmd(f'scons -C bsp/{bsp} --pyconfig-silent', output_info=False)
6363

6464
os.chdir(f'{rtt_root}/bsp/{bsp}')
65-
run_cmd('pkgs --update', output_info=False)
65+
run_cmd('pkgs --update-force', output_info=False)
6666
run_cmd('pkgs --list')
6767

6868
nproc = multiprocessing.cpu_count()
@@ -76,8 +76,8 @@ def build_bsp(bsp, scons_args=''):
7676
os.chdir(f'{rtt_root}/bsp/{bsp}')
7777
run_cmd('scons -c', output_info=False)
7878

79-
pkg_dir = os.path.join(rtt_root, 'bsp', bsp, 'packages')
80-
shutil.rmtree(pkg_dir, ignore_errors=True)
79+
#pkg_dir = os.path.join(rtt_root, 'bsp', bsp, 'packages')
80+
#shutil.rmtree(pkg_dir, ignore_errors=True)
8181

8282
return success
8383

0 commit comments

Comments
 (0)