chore: updated workflow files

CloudyPadmal · Oct 20, 2023 · d53bf87 · d53bf87
1 parent ee6c9ed
commit d53bf87
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 74 deletions.
diff --git a/.github/workflows/hardware-ci.yml b/.github/workflows/hardware-ci.yml
@@ -24,10 +24,18 @@ jobs:
           mkdir kicad
           cd kicad
           wget https://gist.githubusercontent.com/CloudyPadmal/dad9975e02bf39d6a3d2851ca53981cc/raw/0f342a3bba82b1af9789be689e5c00b4ad914015/kicad_common
+          
+      - name: Install kibot
+        run: |
+          wget https://set-soft.github.io/debian/kibot.list
+          sudo cp kibot.list /etc/apt/sources.list.d/
+          wget https://set-soft.github.io/debian/kibot.gpg
+          sudo cp kibot.gpg /etc/apt/
+          sudo apt-get update
+          sudo apt install kibot kidiff
 
       - name: Install dependencies
         run: |
-          pip install --no-compile kibot
           pip install pcb-tools image
           sudo apt install xvfb recordmydesktop xdotool libmagickwand-dev librsvg2-bin imagemagick poppler-utils
         
@@ -77,4 +85,10 @@ jobs:
         with:
           name: design-rule-check
           path: schematics/PSLab-drc.txt
+
+      - name: Difference
+        uses: actions/upload-artifact@v3
+        with:
+          name: difference
+          path: docs/components/PSLab-diff_pcb.pdf
 
diff --git a/.github/workflows/pullrequest-ci.yml b/.github/workflows/pullrequest-ci.yml
@@ -13,14 +13,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: PSLAB
+
     steps:
       - name: Download project files
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install KiCAD
         run: |
-          sudo add-apt-repository --yes ppa:kicad/kicad-5.1-releases
+          sudo add-apt-repository --yes ppa:kicad/kicad-7.0-releases
           sudo apt update
           sudo apt install --install-recommends kicad -y -qq
       
@@ -30,12 +30,18 @@ jobs:
           mkdir kicad
           cd kicad
           wget https://gist.githubusercontent.com/CloudyPadmal/dad9975e02bf39d6a3d2851ca53981cc/raw/0f342a3bba82b1af9789be689e5c00b4ad914015/kicad_common
+          
+      - name: Install kibot
+        run: |
+          wget https://set-soft.github.io/debian/kibot.list
+          sudo cp kibot.list /etc/apt/sources.list.d/
+          wget https://set-soft.github.io/debian/kibot.gpg
+          sudo cp kibot.gpg /etc/apt/
+          sudo apt-get update
+          sudo apt install kibot kidiff
 
       - name: Install dependencies
         run: |
-          pip install --no-compile kibot
-          wget https://github.com/INTI-CMNB/InteractiveHtmlBom/releases/download/v2.3.4-2/interactivehtmlbom.inti-cmnb_2.3.4-2_all.deb
-          sudo dpkg -i interactivehtmlbom.inti-cmnb_2.3.4-2_all.deb
           pip install pcb-tools image cloudinary
           sudo apt install xvfb recordmydesktop xdotool libmagickwand-dev librsvg2-bin imagemagick poppler-utils
         
@@ -45,76 +51,49 @@ jobs:
           kibot -v
           
       - name: Publish PDF schematic
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: schematic-pdf
           path: docs/schematics/PSLab.pdf
 
       - name: Publish interactive bill of materials
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: interactive-bom
           path: docs/components/InteractiveBoM.html
 
       - name: Publish bill of materials
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: bill-of-materials
           path: docs/components/BillOfMaterials.csv
 
       - name: Publish gerbers
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: gerbers
           path: output/Gerber/
 
       - name: Publish centroids
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: pick-and-place
           path: docs/position_files/PositionFile.csv
 
       - name: Electric Rule Check
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: electric-rule-check
           path: schematics/PSLab-erc.txt
 
       - name: Design Rule Check
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: design-rule-check
           path: schematics/PSLab-drc.txt
 
-      - name: Setup board diff images
-        run: |
-          python3 scripts/pslab_gerber_generator.py
-          git clone --quiet --branch=diff-img https://$GITHUB_ACTOR:${{ secrets.PSLAB_KEY }}@github.com/$GITHUB_REPOSITORY diff-img > /dev/null
-          cd diff-img
-          convert -colorspace gray front-layer.png old-front.png
-          convert -colorspace gray bottom-layer.png old-bottom.png
-          convert -colorspace gray ground-layer.png old-ground.png
-          convert -colorspace gray power-layer.png old-power.png
-          mv ../output/Images/* .
-          convert -colorspace gray front-layer.png new-front.png
-          convert -colorspace gray bottom-layer.png new-bottom.png
-          convert -colorspace gray ground-layer.png new-ground.png
-          convert -colorspace gray power-layer.png new-power.png
-          composite -stereo 0 old-front.png new-front.png diff-front.png
-          composite -stereo 0 old-bottom.png new-bottom.png diff-bottom.png
-          composite -stereo 0 old-ground.png new-ground.png diff-ground.png
-          composite -stereo 0 old-power.png new-power.png diff-power.png
-          mv PSLab.pdf old-PSLab.pdf
-          cp ../docs/schematics/PSLab.pdf .
-          pdftoppm old-PSLab.pdf old-PSLab -png -rx 300 -ry 300
-          pdftoppm PSLab.pdf new-PSLab -png -rx 300 -ry 300
-          convert -colorspace gray old-PSLab-1.png old-PSLab.png
-          convert -colorspace gray new-PSLab-1.png new-PSLab.png
-          composite -stereo 0 old-PSLab.png new-PSLab.png diff-schematic.png
-          rm -rf old-* new-*
-      
-      - name: Upload board diff images
-        uses: actions/upload-artifact@v2
+      - name: Difference
+        uses: actions/upload-artifact@v3
         with:
-          name: board-diff-images
-          path: diff-img/diff-*.png       
+          name: difference
+          path: docs/components/PSLab-diff_pcb.pdf     
diff --git a/schematics/CI.kibot.yaml b/schematics/CI.kibot.yaml
@@ -64,35 +64,40 @@ outputs:
       use_alt: false
       variant: ''
 ###############################################################################
-# - name: 'interactive_bom'
-#   comment: "Interactive Bill of Materials"
-#   type: ibom
-#   dir: '../docs/components'
-#   options:
-#     hide_pads: false
-#     show_fabrication: false
-#     hide_silkscreen: false
-#     highlight_pin1: true
-#     no_redraw_on_drag: false
-#     board_rotation: 0
-#     checkboxes: 'Sourced,Placed'
-#     bom_view: 'left-right'
-#     layer_view: 'FB'
-#     name_format: 'InteractiveBoM'
-#     output: ''
-#     include_tracks: false
-#     include_nets: false
-#     sort_order: 'C,R,L,D,U,Y,X,F,SW,A,~,HS,CNN,J,P,NT,MH'
-#     blacklist: 'DNF*'
-#     no_blacklist_virtual: false
-#     blacklist_empty_val: false
-#     netlist_file: ''
-#     extra_fields: ''
-#     normalize_field_case: false
-#     variant_field: ''
-#     variants_whitelist: ''
-#     variants_blacklist: ''
-#     dnp_field: ''
+  - name: 'diff_checker'
+    comment: "Checking difference between versions"
+    type: diff
+    dir: '../docs/components'
+###############################################################################
+  - name: 'interactive_bom'
+    comment: "Interactive Bill of Materials"
+    type: ibom
+    dir: '../docs/components'
+    options:
+      hide_pads: false
+      show_fabrication: false
+      hide_silkscreen: false
+      highlight_pin1: true
+      no_redraw_on_drag: false
+      board_rotation: 0
+      checkboxes: 'Sourced,Placed'
+      bom_view: 'left-right'
+      layer_view: 'FB'
+      name_format: 'InteractiveBoM'
+      output: ''
+      include_tracks: false
+      include_nets: false
+      sort_order: 'C,R,L,D,U,Y,X,F,SW,A,~,HS,CNN,J,P,NT,MH'
+      blacklist: 'DNF*'
+      no_blacklist_virtual: false
+      blacklist_empty_val: false
+      netlist_file: ''
+      extra_fields: ''
+      normalize_field_case: false
+      variant_field: ''
+      variants_whitelist: ''
+      variants_blacklist: ''
+      dnp_field: ''
 ###############################################################################
   - name: 'gerber_generator'
     comment: "Gerbers files"