Rename output files, and move stuff out of subfolders

Author: thejpster

.github/workflows/kicad-release.yml

@@ -43,13 +43,15 @@ jobs:
           draft: false
           prerelease: false
       - name: Build gerbers zip file
+        env:
+          SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
         run: |
-          zip -r --junk-paths neotron-pico-gerbers.zip docs/gerbers/
+          zip -r --junk-paths neotron-pico-gerbers-${SOURCE_TAG}.zip docs/gerbers/
       - name: Upload files to Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            neotron-pico-gerbers.zip
+            neotron-pico-gerbers-*.zip
             docs/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Kicad/docs.kibot.yaml

@@ -31,14 +31,13 @@ preflight:
 
 outputs:
   # For more information: https://github.com/INTI-CMNB/KiBoM
-  - name: 'generic Schematic PDF'
+  - name: 'generic_sch_pdf'
     comment: "Print the schematic as a PDF"
     type: pdf_sch_print
-    dir: pdfs
     options:
       output: '%f-schematic-%r.%x'
 
-  - name: 'generate gerbers'
+  - name: 'make_gerbers'
     comment: "Generate gerber files"
     type: gerber
     layers: 
@@ -74,17 +73,17 @@ outputs:
       use_gerber_x2_attributes: true
       use_gerber_net_attributes: false
 
-  - name: 'generate drills'
+  - name: 'make_drills'
     comment: "Generate drill files"
     type: excellon
     dir: gerbers
 
-  - name: 'ascii position'
+  - name: 'make_ascii_position'
     comment: "Generate XY position files in ASCII"
     type: position
     dir: gerbers
 
-  - name: 'generate PCB DXF'
+  - name: 'make_dxf'
     comment: "Generate 2D PCB CAD in DXF format"
     type: dxf
     layers:
@@ -104,29 +103,28 @@ outputs:
       exclude_edge_layer: false
       metric_units: true
 
-  - name: 'generate SVG'
+  - name: 'make_svg'
     comment: "Generate 2D PCB image in SVG format"
     type: pcbdraw
     options:
       output: '%f-pcb-%r.%x'
 
-  - name: 'generate PNG'
+  - name: 'make_png'
     comment: "Generate 2D PCB image in PNG format"
     type: pcbdraw
     options:
       output: '%f-pcb-%r.%x'
       format: png
 
-  - name: 'generate 3D model'
+  - name: 'make_step'
     comment: "Generate 3D PCB model in STEP format"
     type: step
     options:
       output: '%f-3d-%r.%x'
 
-  - name: 'generate PCB PDF'
+  - name: 'make_pcb_pdf'
     comment: "Generate 2D PCB CAD in PDF format"
     type: pdf_pcb_print
-    dir: pdfs
     layers:
       - F.Cu
       - In1.Cu
@@ -144,22 +142,20 @@ outputs:
       separated: true
       monochrome: true
 
-  - name: 'generate BoM in CSV'
-    comment: "Generate bill-of-material files"
-    type: kibom
-    dir: gerbers
+  - name: 'make_bom_csv'
+    comment: "Generate bill-of-material file as CSV"
+    type: bom
     options:
       output: '%f-bom-%r.%x'
 
-  - name: 'generate BoM in HTML'
+  - name: 'make_ibom'
     comment: "Generate assembly HTML page"
     type: ibom
-    dir: ibom
     options:
       output: '%f-ibom-%r.%x'
 
-  - name: 'jlc position'
-    comment: "Pick and place file, JLC style"
+  - name: 'make_jlc_position'
+    comment: "Generate pick and place file, JLC style"
     type: position
     options:
       variant: rotated
@@ -182,8 +178,8 @@ outputs:
         - id: Side
           name: Layer
 
-  - name: 'jlc bom'
-    comment: "BoM for JLC"
+  - name: 'make_jlc_bom'
+    comment: "Generate BoM, JLC style"
     type: bom
     options:
       output: '%f-bom-jlc-%r.%x'