CI/Tools: added board CubeOrange-Octano

CarbonixUAV · Nov 21, 2024 · 2ff9804 · 2ff9804
1 parent b1066e9
commit 2ff9804
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
@@ -270,12 +270,12 @@ jobs:
         id: check_files
         uses: andstor/file-existence-action@v2
         with:
-          files: "build/CubeOrange/*, build/CubeOrangePlus/*, build/CubeOrange-Volanti/*, build/CubeOrangePlus-Volanti/*, build/CubeOrange-Ottano/*, build/CubeOrangePlus-Ottano/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*"
+          files: "build/CubeOrange/*, build/CubeOrangePlus/*, build/CubeOrange-Volanti/*, build/CubeOrangePlus-Volanti/*, build/CubeOrange-Ottano/*, build/CubeOrangePlus-Ottano/*, build/CubeOrange-Octano/*, build/CarbonixF405/*, build/CarbonixF405-no-crystal/*"
           fail: true
       - name: Gather build output
         run: |
           mkdir -p temp/others
-          for dir in CubeOrange CubeOrangePlus CubeOrange-Volanti CubeOrangePlus-Volanti CubeOrange-Ottano CubeOrangePlus-Ottano CarbonixF405 CarbonixF405-no-crystal; do
+          for dir in CubeOrange CubeOrangePlus CubeOrange-Volanti CubeOrangePlus-Volanti CubeOrange-Ottano CubeOrangePlus-Ottano CubeOrange-Octano CarbonixF405 CarbonixF405-no-crystal; do
             mkdir -p temp/others/$dir/bin
             cp -vr build/$dir/bin/* temp/others/$dir/bin/
           done
@@ -284,6 +284,7 @@ jobs:
           mv temp/others/CubeOrangePlus-Volanti temp/Volanti
           mv temp/others/CubeOrange-Ottano temp/Ottano
           mv temp/others/CubeOrangePlus-Ottano temp/Ottano
+          mv temp/others/CubeOrange-Octano temp/Octano
           if [ -d "ArduPlane/ReleaseNotes.txt" ]; then
             cp -v ArduPlane/ReleaseNotes.txt temp/
           else

diff --git a/.github/workflows/cx_build_compare.yml b/.github/workflows/cx_build_compare.yml
@@ -24,7 +24,7 @@ jobs:
         exclude:
           - gcc: 10
             toolchain: chibios-clang
-        board: ["CubeOrange-Volanti", "CubeOrangePlus-Volanti", "CubeOrange-Ottano", "CubeOrangePlus-Ottano", "CarbonixF405", "CarbonixF405-no-crystal"]
+        board: ["CubeOrange-Volanti", "CubeOrangePlus-Volanti", "CubeOrange-Ottano", "CubeOrangePlus-Ottano", "CubeOrange-Octano", "CarbonixF405", "CarbonixF405-no-crystal"]
     steps:
       # git checkout the PR
       - uses: actions/checkout@v4

diff --git a/Tools/Carbonix_scripts/build_no_clean.sh b/Tools/Carbonix_scripts/build_no_clean.sh
@@ -8,7 +8,7 @@ set -e
 # The board to build for is passed as an argument to the script
 BOARD=$1
 
-if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CubeOrangePlus" ] || [ "$BOARD" == "CubeOrange-Volanti" ] || [ "$BOARD" == "CubeOrangePlus-Volanti" ] || [ "$BOARD" == "CubeOrange-Ottano" ] || [ "$BOARD" == "CubeOrangePlus-Ottano" ] || [ "$BOARD" == "sitl" ]
+if [ "$BOARD" == "CubeOrange" ] || [ "$BOARD" == "CubeOrangePlus" ] || [ "$BOARD" == "CubeOrange-Volanti" ] || [ "$BOARD" == "CubeOrangePlus-Volanti" ] || [ "$BOARD" == "CubeOrange-Ottano" ] || [ "$BOARD" == "CubeOrangePlus-Ottano" ] || [ "$BOARD" == "sitl" ] || [ "$BOARD" == "CubeOrange-Octano"]
 then
     echo "Compiling Plane for $BOARD..."
     ./waf plane

diff --git a/Tools/Carbonix_scripts/carbonix_waf_build.sh b/Tools/Carbonix_scripts/carbonix_waf_build.sh
@@ -6,7 +6,7 @@ set -e
 echo "Running distclean..."
 ./waf distclean
 
-main_boards=("CubeOrange" "CubeOrangePlus" "CubeOrange-Volanti" "CubeOrangePlus-Volanti" "CubeOrange-Ottano" "CubeOrangePlus-Ottano")
+main_boards=("CubeOrange" "CubeOrangePlus" "CubeOrange-Volanti" "CubeOrangePlus-Volanti" "CubeOrange-Ottano" "CubeOrangePlus-Ottano" "CubeOrange-Octano")
 for board in "${main_boards[@]}"; do
   echo "Compiling ArduPlane for $board..."
   ./waf configure --board "$board" -g