diff options
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/aht21.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/aht21.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ap3216c.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ap3216c.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ethernet_28j60.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ethernet_28j60.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/fal_easyflash.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/fal_easyflash.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/filesystem.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/filesystem.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/icm20608.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/icm20608.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lcd_st7787.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lcd_st7787.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/led_matrix.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/led_matrix.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lvgl.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rs485.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rs485.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rw007.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rw007.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/spi_flash_w25q64.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/spi_flash_w25q64.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/sram.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/sram.attach) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/usb_mouse.attach (renamed from bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/usb_mouse.attach) | 0 | ||||
| -rw-r--r-- | tools/ci/bsp_buildings.py | 26 |
15 files changed, 16 insertions, 10 deletions
diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/aht21.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/aht21.attach index e9269471b5..e9269471b5 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/aht21.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/aht21.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ap3216c.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ap3216c.attach index b8da5bcfb3..b8da5bcfb3 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ap3216c.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ap3216c.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ethernet_28j60.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ethernet_28j60.attach index 085b183d92..085b183d92 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/ethernet_28j60.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/ethernet_28j60.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/fal_easyflash.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/fal_easyflash.attach index 70aac6f974..70aac6f974 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/fal_easyflash.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/fal_easyflash.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/filesystem.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/filesystem.attach index 72c479e8d0..72c479e8d0 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/filesystem.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/filesystem.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/icm20608.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/icm20608.attach index 922671ca35..922671ca35 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/icm20608.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/icm20608.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lcd_st7787.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lcd_st7787.attach index c4044805ae..c4044805ae 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lcd_st7787.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lcd_st7787.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/led_matrix.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/led_matrix.attach index 7c18402022..7c18402022 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/led_matrix.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/led_matrix.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lvgl.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach index 1ce3e528aa..1ce3e528aa 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/lvgl.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/lvgl.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rs485.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rs485.attach index 144fb35d85..144fb35d85 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rs485.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rs485.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rw007.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rw007.attach index be96228ae1..be96228ae1 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/rw007.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/rw007.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/spi_flash_w25q64.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/spi_flash_w25q64.attach index a2a4b41993..a2a4b41993 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/spi_flash_w25q64.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/spi_flash_w25q64.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/sram.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/sram.attach index 516182d2b5..516182d2b5 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/sram.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/sram.attach diff --git a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/usb_mouse.attach b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/usb_mouse.attach index ad9c397d8b..ad9c397d8b 100644 --- a/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/usb_mouse.attach +++ b/bsp/stm32/stm32f407-rt-spark/.ci/attachconfig/peripheral/usb_mouse.attach diff --git a/tools/ci/bsp_buildings.py b/tools/ci/bsp_buildings.py index d14d2ef89d..8ffd2d9849 100644 --- a/tools/ci/bsp_buildings.py +++ b/tools/ci/bsp_buildings.py @@ -1,6 +1,4 @@ import os -import re -import glob import shutil import multiprocessing @@ -108,7 +106,10 @@ def build_bsp_attachconfig(bsp, attach_file): config_bacakup = config_file+'.origin' shutil.copyfile(config_file, config_bacakup) - append_file(attach_file, config_file) + attachconfig_dir = os.path.join(rtt_root, 'bsp', bsp, '.ci/attachconfig') + attach_path = os.path.join(attachconfig_dir, attach_file) + + append_file(attach_path, config_file) res = build_bsp(bsp) @@ -145,18 +146,23 @@ if __name__ == "__main__": print("::endgroup::") attach_dir = os.path.join(rtt_root, 'bsp', bsp, '.ci/attachconfig') - attach_files = glob.glob(os.path.join(attach_dir, '*.attach')) - for attach_file in attach_files: + attach_list = [] + for root, dirs, files in os.walk(attach_dir): + for file in files: + file_path = os.path.join(root, file) + relative_path = os.path.relpath(file_path, attach_dir) + attach_list.append(relative_path) + + for attach_file in attach_list: count += 1 - attach = os.path.basename(attach_file) - print(f"::group::\tCompiling BSP: =={count}=== {bsp} {attach}===") + print(f"::group::\tCompiling BSP: =={count}=== {bsp} {attach_file}===") res = build_bsp_attachconfig(bsp, attach_file) if not res: - print(f"::error::build {bsp} {attach} failed.") - add_summary(f'\t- ❌ build {attach} failed.') + print(f"::error::build {bsp} {attach_file} failed.") + add_summary(f'\t- ❌ build {attach_file} failed.') failed += 1 else: - add_summary(f'\t- ✅ build {attach} success.') + add_summary(f'\t- ✅ build {attach_file} success.') print("::endgroup::") exit(failed) |
