w

SW-191
CarbonixUAV · May 10, 2024 · b57456f · b57456f
1 parent 18daef4
commit b57456f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/.github/workflows/carbonix_build.yml b/.github/workflows/carbonix_build.yml
@@ -1,4 +1,4 @@
-name: Build and Archive
+name: Carbonix Build
 
 on:
     push:
@@ -171,7 +171,7 @@ jobs:
       - name: build Carbonix Flight Controller
         shell: bash
         run: |
-          boards=("CubeOrange" "CarbonixCubeOrange" "sitl")
+          boards=("CubeOrange")
           for board in "${boards[@]}"; do
             echo "Compiling AP_Periph for $board..."
             ./Tools/scripts/build_bootloaders.py "$board"
@@ -182,7 +182,7 @@ jobs:
       - name: build Carbonix Periph boards
         shell: bash
         run: |
-          boards=("CarbonixF405" "Volanti-M1" "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")
+          boards=("CarbonixF405" "Volanti-M1" )
           for board in "${boards[@]}"; do
             echo "Compiling AP_Periph for $board..."
             ./Tools/scripts/build_bootloaders.py "$board"
@@ -194,20 +194,24 @@ jobs:
         id: check_files
         uses: andstor/file-existence-action@v2
         with:
-          files: "build/CubeOrange/*, build/CarbonixCubeOrange/*, build/sitl/*, build/CarbonixF405/*, build/Volanti-M1/*, build/Volanti-M2/*, build/Volanti-M3/*, build/Volanti-M4/*, build/Volanti-M5/*, build/Volanti-LWing/*, build/Volanti-RWing/*, build/Volanti-LTail/*, build/Volanti-RTail/*, build/Ottano-M1/*, build/Ottano-M2/*, build/Ottano-M3/*, build/Ottano-M4/*, build/Ottano-M5/*, build/Ottano-LWing/*, build/Ottano-RWing/*, build/Ottano-LTail/*, build/Ottano-RTail/*"
+          files: "build/CubeOrange/*, build/CarbonixF405/*, build/Volanti-M1/*"
           fail: true
       - name: Extract firmware version and commit id
         id: extract_info
         run: |
-          FIRMWARE_VERSION=$(grep -oP '#define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' /libraries/AP_Common/AP_FWVersionDefine.h)
+          FIRMWARE_VERSION=$(grep -oP '#define AP_CUSTOM_FIRMWARE_STRING "\K(.*)(?=")' libraries/AP_Common/AP_FWVersionDefine.h)
           COMMIT_ID=$(git rev-parse --short HEAD)
           echo "firmware_version=$FIRMWARE_VERSION" >> $GITHUB_ENV
           echo "commit_id=$COMMIT_ID" >> $GITHUB_ENV
+        shell: sh -e {0}
       - name: Gather build output
         run: |
-          mkdir temp
-          find build/*/bin/ -type f -exec cp -t temp {} +
+          mkdir -p temp
+          for dir in CubeOrange CarbonixF405 Volanti-M1; do
+            find ${{ github.workspace }}/build/$dir/bin/ -type f -exec rsync -R {} temp/ \;
+          done
           cp -v ArduPlane/ReleaseNotes.txt temp/
+        shell: sh -e {0}
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3
         with: