Update build workflows to use KiBot (no autoroute)

ceoloide · Sep 30, 2023 · ff61f4b · ff61f4b
1 parent f46178d
commit ff61f4b
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 85 deletions.
diff --git a/.github/actions/export-dsn/action.yaml b/.github/actions/export-dsn/action.yaml
@@ -2,24 +2,22 @@ name: 'Export DSN'
 description: 'Export Specctra DSN from a Kicad PCB'
 inputs:
   boards:
-    description: 'Board names'
+    description: 'KiCad PCB names'
     required: true
 runs:
   using: 'docker'
-  image: 'docker://soundmonster/kicad-automation-scripts:latest'
+  image: 'docker://ghcr.io/inti-cmnb/kicad7_auto@latest'
   entrypoint: '/bin/sh'
   args:
     - '-c'
     # GH actions set $HOME to a weird location and we have to move Kicad settings there first
     - |
-      mkdir -p $HOME/.config/kicad;
-      cp /root/.config/kicad/* $HOME/.config/kicad;
       for board in ${{ inputs.boards }};
       do
         echo Processing $board;
         if [ -e $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn ]; then
           echo Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn
           rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn
         fi
-        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/export_dsn.py $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn
+        $GITHUB_WORKSPACE/kibot/export_dsn.py -b $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb -o $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn 
       done
diff --git a/.github/actions/export-gerbers/action.yaml b/.github/actions/export-gerbers/action.yaml
diff --git a/.github/actions/kibot/action.yaml b/.github/actions/kibot/action.yaml
@@ -0,0 +1,19 @@
+name: 'Run KiBot'
+description: 'Run KiBot automation to generate images and gerbers'
+inputs:
+  boards:
+    description: 'KiCad PCB names'
+    required: true
+runs:
+  using: 'docker'
+  image: 'docker://ghcr.io/inti-cmnb/kicad7_auto@latest'
+  entrypoint: '/bin/sh'
+  args:
+    - '-c'
+    # GH actions set $HOME to a weird location and we have to move Kicad settings there first
+    - |
+      for board in ${{ inputs.boards }};
+      do
+        echo Processing $board;
+        kibot -b ergogen/output/pcbs/${board}.kicad_pcb -c $GITHUB_WORKSPACE/kibot/boards.kibot.yaml
+      done
diff --git a/.github/actions/run-drc/action.yaml b/.github/actions/run-drc/action.yaml
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,28 +30,28 @@ jobs:
         run: npm install
       - name: Generate unrouted PCBs with Ergogen (definition in package.json)
         run: npm run build
-      - name: Export DSN 
-        uses: ./.github/actions/export-dsn
-        with:
-          boards: corney_island
-      - name: Autoroute PCB
-        uses: ./.github/actions/autoroute
-        with:
-          boards: corney_island
-      - name: Import SES
-        uses: ./.github/actions/import-ses
+      - name: Run KiBot to generate images, gerbers for the plate files
+        uses: ./.github/actions/kibot
         with:
-          boards: corney_island
-      - name: DRC check
-        uses: ./.github/actions/run-drc
-        with:
-          boards: corney_island
-      - name: Export Gerbers
-        uses: ./.github/actions/export-gerbers
+          boards: frontplate,backplate,controller_overlay,corney_island 
+      - name: Export DSN file for Freerouting
+        uses: ./.github/actions/export-dsn
         with:
           boards: corney_island
+      # - name: Autoroute PCB
+      #   uses: ./.github/actions/autoroute
+      #   with:
+      #     boards: corney_island
+      # - name: Import SES
+      #   uses: ./.github/actions/import-ses
+      #   with:
+      #     boards: corney_island
+      # - name: DRC check
+      #   uses: ./.github/actions/run-drc
+      #   with:
+      #     boards: corney_island
       - name: Persist output
         uses: actions/upload-artifact@v3
         with:
-          name: corney_island
+          name: corney_island_unrouted
           path: ergogen/output
diff --git a/build.sh b/build.sh
@@ -24,7 +24,7 @@ pcbdraw_style=set-black-hasl
 for plate in ${plates}
 do
     echo "\n\n>>>>>> Processing $plate <<<<<<\n\n"
-    ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:1.6.2 kibot -b ergogen/output/pcbs/${plate}.kicad_pcb -c kibot/boards.kibot.yaml
+    ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:latest kibot -b ergogen/output/pcbs/${plate}.kicad_pcb -c kibot/boards.kibot.yaml
 done
 
 for board in ${boards}
@@ -33,17 +33,17 @@ do
     ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /bin/sh -c "mkdir -p $HOME/.config/kicad; cp /root/.config/kicad/* $HOME/.config/kicad"
     if [ -e ergogen/output/pcbs/${board}.kicad_pcb ]; then
         echo Export DSN 
-        ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:1.6.2 kibot/export_dsn.py -b ergogen/output/pcbs/${board}.kicad_pcb -o ergogen/output/pcbs/${board}.dsn    
-    fi
-    if [ -e ergogen/output/pcbs/${board}.dsn ]; then
-        echo Autoroute PCB
-        ${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses
-    fi
-    if [ -e ergogen/output/pcbs/${board}.ses ]; then
-        echo "Import SES"
-        ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py ergogen/output/pcbs/${board}.kicad_pcb ergogen/output/pcbs/${board}.ses --output-file ergogen/output/pcbs/${board}_routed.kicad_pcb
-    fi
-    if [ -e ergogen/output/pcbs/${board}_routed.kicad_pcb ]; then
-        ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:1.6.2 kibot -b ergogen/output/pcbs/${board}_routed.kicad_pcb -c kibot/boards.kibot.yaml
+        ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:latest kibot/export_dsn.py -b ergogen/output/pcbs/${board}.kicad_pcb -o ergogen/output/pcbs/${board}.dsn    
     fi
+    # if [ -e ergogen/output/pcbs/${board}.dsn ]; then
+    #     echo Autoroute PCB
+    #     ${container_cmd} run ${container_args} soundmonster/freerouting_cli:v0.1.0 java -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses
+    # fi
+    # if [ -e ergogen/output/pcbs/${board}.ses ]; then
+    #     echo "Import SES"
+    #     ${container_cmd} run ${container_args} soundmonster/kicad-automation-scripts:latest /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py ergogen/output/pcbs/${board}.kicad_pcb ergogen/output/pcbs/${board}.ses --output-file ergogen/output/pcbs/${board}_routed.kicad_pcb
+    # fi
+    # if [ -e ergogen/output/pcbs/${board}_routed.kicad_pcb ]; then
+    #     ${container_cmd} run ${container_args} ghcr.io/inti-cmnb/kicad7_auto:1.6.2 kibot -b ergogen/output/pcbs/${board}_routed.kicad_pcb -c kibot/boards.kibot.yaml
+    # fi
 done