ci

Author: kaidegit

.github/workflows/bsp_buildings.yml

@@ -435,12 +435,6 @@ jobs:
           echo "RTT_CC=gcc" >> $GITHUB_ENV
           echo "export PATH=~/.env/tools/scripts:$PATH" > ~/.env/env.sh
           sudo apt install cmake ninja-build 
-      
-      # - name: Install Cmake & Ninja
-      #   uses: lukka/get-cmake@latest
-      #   with:
-      #     cmakeVersion: latest      
-      #     ninjaVersion: latest        
 
       - name: Install Arm ToolChains
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-arm' && success() }}
@@ -533,11 +527,6 @@ jobs:
           RTT_BUILD_TOOL: ${{ matrix.legs.RTT_BUILD_TOOL }}
           SRTT_BSP: ${{ join(matrix.legs.SUB_RTT_BSP, ',') }}
         run: |
-          which cmake
-          cmake --version
-          cmake --help
-          which ninja
-          ninja --version
           source ~/.env/env.sh
           python tools/ci/bsp_buildings.py
 

tools/ci/bsp_buildings.py

@@ -38,6 +38,15 @@ def run_cmd(cmd, output_info=True):
 
 
 def build_bsp(bsp, scons_args=''):
+    if build_tool == 'scons':
+        return build_bsp_scons(bsp)
+    elif build_tool =='cmake':
+        return build_bsp_cmake(bsp)
+    else:
+        print(f"::error::build tool {build_tool} is not supported")
+        return False
+
+def build_bsp_scons(bsp, scons_args=''):
     """
     build bsp.
 
@@ -230,13 +239,7 @@ def build_bsp_attachconfig(bsp, attach_file):
     for bsp in srtt_bsp:
         count += 1
         print(f"::group::Compiling BSP: =={count}=== {bsp} ====")
-        res = False
-        if build_tool == 'scons':
-            res = build_bsp(bsp)
-        elif build_tool =='cmake':
-            res = build_bsp_cmake(bsp)
-        else:
-            print(f"::error::build tool {build_tool} is not supported")
+        res = build_bsp(bsp)
         if not res:
             print(f"::error::build {bsp} failed")
             add_summary(f"- ❌ build {bsp} failed.")