Optimize/Extend release pipeline

Author: 0x007E

.github/workflows/release.yml

@@ -9,9 +9,10 @@ jobs:
   export-kicad:
     env:
       BaseFileName: "PMG"
+      Folder: "./pcb"
       SchematicFileExtension: "kicad_sch"
       PCBFileExtension: "kicad_pcb"
-      OutputFolder: "kicad"
+      OutputFolder: "./output"
       ConfigFilePath: ".kibot/release.kibot.yaml"
     runs-on: ubuntu-latest
     steps:
@@ -21,22 +22,17 @@ jobs:
     - name: Prepare output directory
       run: |
         mkdir -p ${{ env.OutputFolder }}
-        cp -r ./pcb ${{ env.OutputFolder }}/kicad
+        cp -r ${{ env.Folder }} ${{ env.OutputFolder }}/kicad
         cp ./LICENSE ${{ env.OutputFolder }}
 
-    - name: Copy License
-      run: |
-          mkdir -p ${{ env.OutputFolder }}
-          cp ./LICENSE ${{ env.OutputFolder }}
-    
     - name: Run KiBOT
-      uses: INTI-CMNB/KiBot@v2_dk7
+      uses: INTI-CMNB/KiBot@v2_k9
       with:
         config: ${{ env.ConfigFilePath }}
         dir: ${{ env.OutputFolder }}
-        schema: "pcb/${{ env.BaseFileName }}.${{ env.SchematicFileExtension }}"
-        board: "pcb/${{ env.BaseFileName }}.${{ env.PCBFileExtension }}"
-    
+        schema: "${{ env.Folder }}/${{ env.BaseFileName }}.${{ env.SchematicFileExtension }}"
+        board: "${{ env.Folder }}/${{ env.BaseFileName }}.${{ env.PCBFileExtension }}"
+
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -46,25 +42,26 @@ jobs:
 
   export-freecad:
     env:
-      FREECADVERSION: "0.21.2"
+      FREECADVERSION: "1.1.1"
       FreeCADFileName: "./mechanical/housing.FCStd"
       OutputFolder: "./output"
       PartType: "PartDesign::Body"
     runs-on: ubuntu-latest
     steps:
     - name: Fetch repository
       uses: actions/checkout@v4
-
+    
     - name: Prepare output directory
       run: |
         mkdir -p ${{ env.OutputFolder }}
+        cp -r ./mechanical ${{ env.OutputFolder }}
         cp ./LICENSE ${{ env.OutputFolder }}
-          
+
     - name: Install FreeCAD
       run: |
-          wget https://github.com/FreeCAD/FreeCAD/releases/download/${{ env.FREECADVERSION }}/FreeCAD-${{ env.FREECADVERSION }}-Linux-x86_64.AppImage
-          chmod 0777 ./FreeCAD-${{ env.FREECADVERSION }}-Linux-x86_64.AppImage
-          ./FreeCAD-${{ env.FREECADVERSION }}-Linux-x86_64.AppImage --appimage-extract
+          wget https://github.com/FreeCAD/FreeCAD/releases/download/${{ env.FREECADVERSION }}/FreeCAD_${{ env.FREECADVERSION }}-Linux-x86_64-py311.AppImage
+          chmod 0777 FreeCAD_${{ env.FREECADVERSION }}-Linux-x86_64-py311.AppImage
+          ./FreeCAD_${{ env.FREECADVERSION }}-Linux-x86_64-py311.AppImage --appimage-extract
     - name: Get FreeCAD Export
       run: |
           git clone https://github.com/0x007E/pyfreecadexport.git
@@ -160,6 +157,26 @@ jobs:
         asset_path: ./artifact/kicad/drill/PMG-drill_map.pdf
         asset_name: drill.pdf
         asset_content_type: application/pdf
+    
+    - name: Upload KiCAD BOM
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./artifact/kicad/bom/PMG-bom.xlsx
+        asset_name: bom.xlsx
+        asset_content_type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+    
+    - name: Upload KiCAD iBOM
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./artifact/kicad/ibom/IBOM.html
+        asset_name: bom.html
+        asset_content_type: text/html
 
     - name: Upload KiCAD Asset
       uses: actions/upload-release-asset@v1
@@ -214,4 +231,5 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: ./artifact/freecad.zip
         asset_name: freecad.zip
-        asset_content_type: application/zip
+        asset_content_type: application/zip
+        

.kibot/release.kibot.yaml

@@ -21,18 +21,12 @@ globals:
 preflight:
   check_zone_fills: true
   fill_zones: true
-  run_erc: true
-  run_drc: true
-  filters:
-    - filter: 'does not match copy in library'
-      error: 'lib_footprint_mismatch'
-      regex: 'does not match copy in library'
-    - filter: 'Silkscreen overlap'
-      error: 'silk_overlap'
-      regex: 'Silkscreen overlap'
-    # - filter: 'Missing connection between items'
-    #   error: 'unconnected_items'
-    #   regex: 'Missing connection between items'
+
+  erc:
+    enabled: true
+  drc:
+    enabled: true
+  
   set_text_variables:
     - name: 'date'
       command: 'date +%d.%m.%Y'
@@ -51,48 +45,32 @@ outputs:
         - Row
         - References
         - Footprint
-        - field: Vendor
-          name: Vendor
-        - field: VendorId
-          name: VendorId
+        - field: HTL
+          name: HTL
         - Quantity Per PCB
       normalize_values: true
 
+  - name: 'ibom'
+    comment: 'Interactive HTML BoM'
+    type: ibom
+    dir: './ibom'
+    options:
+      output: 'IBOM.%x'
+      layer_view: 'F'
+      # bom_view: 'left-right'
+      bom_view: 'top-bottom'
+      include_tracks: false
+      show_fields: 'Value,Footprint,HTL'
+
   - name: 'print_sch'
     comment: 'Schematic PDF'
     type: pdf_sch_print
     dir: './schematic'
     options:
       monochrome: true
 
-  - name: 'gerbers'
-    comment: 'Gerber Files'
-    type: gerber
-    dir: './gerber'
-    layers:
-      - F.Cu
-      - B.Cu
-      - F.Adhesive
-      - B.Adhesive
-      - F.Paste
-      - B.Paste
-      - F.Silkscreen
-      - B.Silkscreen
-      - F.Mask
-      - B.Mask
-      - Edge.Cuts
-
-  - name: drill
-    comment: Drill files
-    type: excellon
-    dir: './drill'
-    options:
-      map:
-        type: pdf
-      pth_and_npth_single_file: true
-
-  - name: print_pdf_top
-    comment: 'PCB PDF TOP'
+  - name: print_pcb
+    comment: 'PCB to PDF'
     type: pcb_print
     dir: './pcb'
     options:
@@ -145,6 +123,42 @@ outputs:
         #   monochrome: true
         #   mirror: true
 
+  - name: 'gerbers'
+    comment: 'Gerber Files'
+    type: gerber
+    dir: './gerber'
+    layers:
+      - F.Cu
+      - B.Cu
+      - F.Adhesive
+      - B.Adhesive
+      - F.Paste
+      - B.Paste
+      - F.Silkscreen
+      - B.Silkscreen
+      - F.Mask
+      - B.Mask
+      - Edge.Cuts
+
+  - name: drill
+    comment: Drill files
+    type: excellon
+    dir: './drill'
+    options:
+      map:
+        type: pdf
+      pth_and_npth_single_file: true
+      
+  - name: mechanical
+    comment: "3D export (STEP)"
+    type: export_3d
+    dir: './step'
+    options:
+      format: 'step'
+      output: '%f-%i%I%v.%x'
+      download: true
+      no_virtual: true
+
   # - name: board_top_filled
   #   comment: "Top layer view with components"
   #   type: pcbdraw
@@ -163,11 +177,6 @@ outputs:
   #     dpi: 300
   #     bottom: true
   #     show_components: all
-      
-  - name: mechanical
-    comment: "STEP model"
-    type: step
-    dir: './step'
 
   - name: 3D_top
     comment: "3D render from top (High Quality)"