wip

SW-46
CarbonixUAV · Jan 11, 2024 · f9e8dc7 · f9e8dc7
1 parent 4a5f935
commit f9e8dc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/cx_build_compare.yml b/.github/workflows/cx_build_compare.yml
@@ -26,7 +26,7 @@ jobs:
           - gcc: 10
             toolchain: chibios-clang
         board: ["Volanti-M2", "Volanti-M3", "Volanti-M4", "Volanti-M5", "Volanti-LWing", "Volanti-RWing", "Volanti-LTail", "Volanti-RTail", "Ottano-M1", "Ottano-M2", "Ottano-M3", "Ottano-M4", "Ottano-M5", "Ottano-LWing", "Ottano-RWing", "Ottano-LTail", "Ottano-RTail"]
-      max-parallel: 1
+      # max-parallel: 1
 
     steps:
       # git checkout the PR
@@ -68,6 +68,8 @@ jobs:
             export CHIBIOS_GIT_VERSION="12345678"
             export GIT_VERSION="abcdef"
             export GIT_VERSION_INT="15"
+            ./waf configure --board "$BOARD"
+
             ./Tools/Carbonix_scripts/carbonix_board_build.sh ${{ matrix.board }}
   
             NO_VERSIONS_DIR="$GITHUB_WORKSPACE/${{matrix.board}}/pr_bin_no_versions"

diff --git a/Tools/Carbonix_scripts/carbonix_board_build.sh b/Tools/Carbonix_scripts/carbonix_board_build.sh
@@ -9,11 +9,9 @@ BOARD=$1
 if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CarbonixCubeOrange" ] || [ "$BOARD" == "sitl" ]
 then
     echo "Compiling Plane for $BOARD..."
-    ./waf configure --board "$BOARD"
     ./waf plane
 else
     echo "Compiling AP_Periph for $BOARD..."
-    ./waf configure --board "$BOARD"
     ./waf AP_Periph
 fi