From 15383fef0b1468c3d0af033fd648a61930f6d062 Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Wed, 26 Feb 2025 14:17:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[action/tool]=20ci=20=E9=AA=8C=E8=AF=81l4?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0,=20=E4=BF=AE=E5=A4=8Dscons=20--dist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/action_tools.yml | 2 +- bsp/stm32/tools/sdk_dist.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/action_tools.yml b/.github/workflows/action_tools.yml index 413122f21bd..85cf0428597 100644 --- a/.github/workflows/action_tools.yml +++ b/.github/workflows/action_tools.yml @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false env: - TEST_BSP_ROOT: bsp/stm32/stm32f407-atk-explorer + TEST_BSP_ROOT: bsp/stm32/stm32l475-atk-pandora steps: - uses: actions/checkout@v4 diff --git a/bsp/stm32/tools/sdk_dist.py b/bsp/stm32/tools/sdk_dist.py index 8da926c5219..7ef49f3a2ba 100644 --- a/bsp/stm32/tools/sdk_dist.py +++ b/bsp/stm32/tools/sdk_dist.py @@ -14,8 +14,9 @@ def dist_do_building(BSP_ROOT, dist_dir): print("=> copy stm32 bsp library") library_dir = os.path.join(dist_dir, 'libraries') library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries') - bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), - os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE)) + if rtconfig.BSP_LIBRARY_TYPE is not None: + bsp_copy_files(os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE), + os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE)) print("=> copy bsp drivers") bsp_copy_files(os.path.join(library_path, 'HAL_Drivers'), os.path.join(library_dir, 'HAL_Drivers')) From a11dea410fd544151ff3d3ff8f7df31a6e4ea18f Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Wed, 26 Feb 2025 14:22:48 +0800 Subject: [PATCH 2/2] Update action_tools.yml --- .github/workflows/action_tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/action_tools.yml b/.github/workflows/action_tools.yml index 85cf0428597..413122f21bd 100644 --- a/.github/workflows/action_tools.yml +++ b/.github/workflows/action_tools.yml @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false env: - TEST_BSP_ROOT: bsp/stm32/stm32l475-atk-pandora + TEST_BSP_ROOT: bsp/stm32/stm32f407-atk-explorer steps: - uses: actions/checkout@v4