use diff, debug, del gerber

42CrMo4 · Jul 6, 2024 · 22ba07f · 22ba07f
1 parent b172bc6
commit 22ba07f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 50 deletions.
diff --git a/.github/workflows/generate_output.yml b/.github/workflows/generate_output.yml
@@ -151,11 +151,11 @@ jobs:
         # echo "Length of pre_release_tags: ${#pre_release_tags[@]}"
         # echo "Length of release_tags: ${#release_tags[@]}"
 
-        # # Debug: Print the last and second to last tags
-        # echo "Last pre-release tag: $pre_release_last_tag"
-        # echo "Last non-pre-release tag: $non_pre_release_last_tag"
-        # echo "Second to last pre-release tag: $pre_release_second_to_last_tag"
-        # echo "Second to last non-pre-release tag: $non_pre_release_second_to_last_tag"
+        # Debug: Print the last and second to last tags
+        echo "Last pre-release tag: $pre_release_last_tag"
+        echo "Last non-pre-release tag: $non_pre_release_last_tag"
+        echo "Second to last pre-release tag: $pre_release_second_to_last_tag"
+        echo "Second to last non-pre-release tag: $non_pre_release_second_to_last_tag"
 
         # Print the tags in a logical order for understanding
         echo "Last Tag: $last_tag"
@@ -215,18 +215,10 @@ jobs:
         sed -i "s!<<ID>>!${{ env.ID }}!" *.kiplot.yaml
 
     - uses: INTI-CMNB/KiBot@v2_k8
-      if: needs.determine-run-type.outputs.run-type == 'ci' 
       with:
         config: config.kiplot.yaml
         dir: Fabrication_temp
 
-    - uses: INTI-CMNB/KiBot@v2_k8
-      if: needs.determine-run-type.outputs.run-type != 'ci' 
-      with:
-        config: config.kiplot.yaml
-        dir: Fabrication_temp
-        targets: 'print_front pcb_top_b pcb_bottom_b step print_sch interactive_bom bom_csv'
-
     - name: Rename the Schematic and PCB Raw Files
       run: |
         mv *.kicad_sch ${{ env.ID }}_${{ env.project_name }}_${{ env.COMMIT }}.kicad_sch
@@ -247,14 +239,6 @@ jobs:
         path: |
           Fabrication_temp/
 
-    - name: Create Gerber zip
-      if: needs.determine-run-type.outputs.run-type != 'ci'
-      uses: vimtor/action-zip@v1
-      with:
-        files: Gerber/
-        recursive: false
-        dest: ${{ env.ID_prefix }}${{ env.ID }}_${{ env.project_name }}_${{ github.ref_name }}_Gerber.zip
-
     - name: Create GitHub Release
       if: needs.determine-run-type.outputs.run-type != 'ci'
       uses: ncipollo/release-action@v1

diff --git a/config.kiplot.yaml b/config.kiplot.yaml
@@ -153,35 +153,35 @@ outputs:
 #     outputs:
 #       type: "render"
 
-#Diffs
-# - name: 'diff_pcb_KIBOT_LAST-1'
-#   comment: "PCB difference KIBOT_LAST-1"
-#   type: diff
-#   dir: Diff
-#   layers: ['F.Cu', 'B.Cu']
-#   options:
-#     output: Diff_PCB_HEAD_KIBOT_LAST-1.pdf
-#     old: KIBOT_LAST-1
-#     old_type: git
-#     new: HEAD
-#     new_type: git
-#     cache_dir: .cache
-#     #add_link_id: true
-#     diff_mode: red_green
-# - name: 'diff_sch_KIBOT_LAST-1'
-#   comment: "SCH difference KIBOT_LAST-1"
-#   type: diff
-#   dir: Diff
-#   options:
-#     output: Diff_SCH_HEAD_KIBOT_LAST-1.pdf
-#     old: KIBOT_LAST-1
-#     old_type: git
-#     new: HEAD
-#     new_type: git
-#     cache_dir: .cache
-#     #add_link_id: true
-#     diff_mode: red_green
-#     pcb: false
+Diffs
+ - name: 'diff_pcb_KIBOT_LAST-1'
+   comment: "PCB difference KIBOT_LAST-1"
+   type: diff
+   dir: Diff
+   layers: ['F.Cu', 'B.Cu']
+   options:
+     output: Diff_PCB_HEAD_KIBOT_LAST-1.pdf
+     old: KIBOT_LAST-1
+     old_type: git
+     new: HEAD
+     new_type: git
+     cache_dir: .cache
+     #add_link_id: true
+     diff_mode: red_green
+ - name: 'diff_sch_KIBOT_LAST-1'
+   comment: "SCH difference KIBOT_LAST-1"
+   type: diff
+   dir: Diff
+   options:
+     output: Diff_SCH_HEAD_KIBOT_LAST-1.pdf
+     old: KIBOT_LAST-1
+     old_type: git
+     new: HEAD
+     new_type: git
+     cache_dir: .cache
+     #add_link_id: true
+     diff_mode: red_green
+     pcb: false
 
 # General
   - name: 'Kicanvas'