From e161fe315e24e325e0161283ff895d9fabc36fd1 Mon Sep 17 00:00:00 2001
From: Marco Massarelli <60667061+ceoloide@users.noreply.github.com>
Date: Mon, 1 Apr 2024 17:15:36 +0000
Subject: [PATCH] Update GitHub Action to use KiCad Auto ki8 (KiCad 8)

---
 .github/actions/autoroute/action.yaml  | 11 +++++++----
 .github/actions/export-dsn/action.yaml | 14 ++++++++------
 .github/actions/import-ses/action.yaml | 18 +++++++++---------
 .github/actions/kibot/action.yaml      |  5 ++---
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/.github/actions/autoroute/action.yaml b/.github/actions/autoroute/action.yaml
index 875c259..5c2e4eb 100644
--- a/.github/actions/autoroute/action.yaml
+++ b/.github/actions/autoroute/action.yaml
@@ -13,10 +13,13 @@ runs:
     - |
       for board in ${{ inputs.boards }};
       do
-        echo Processing $board
+        echo "Processing $board";
         if [ -e ergogen/output/pcbs/${board}.ses ]; then
-          echo Cleaning up ergogen/output/pcbs/${board}.ses
-          rm -f ergogen/output/pcbs/${board}.ses
+          echo "Cleaning up ergogen/output/pcbs/${board}.ses";
+          rm -f ergogen/output/pcbs/${board}.ses;
+        fi
+        if [ -e ergogen/output/pcbs/${board}.dsn ]; then
+          echo "Autoroute PCB";
+          java -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
         fi
-        java -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
       done
\ No newline at end of file
diff --git a/.github/actions/export-dsn/action.yaml b/.github/actions/export-dsn/action.yaml
index 91ddf23..8301801 100644
--- a/.github/actions/export-dsn/action.yaml
+++ b/.github/actions/export-dsn/action.yaml
@@ -6,18 +6,20 @@ inputs:
     required: true
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/inti-cmnb/kicad7_auto:latest'
+  image: 'docker://ghcr.io/inti-cmnb/kicad8_auto:latest'
   entrypoint: '/bin/bash'
   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;
+        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
+          echo "Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn";
+          rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn;
+        fi
+        if [ -e ergogen/output/pcbs/${board}.kicad_pcb ]; then
+          echo "Export DSN";
+          $GITHUB_WORKSPACE/kibot/export_dsn.py -b $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb -o $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn 
         fi
-        $GITHUB_WORKSPACE/kibot/export_dsn.py -b $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb -o $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.dsn 
       done
\ No newline at end of file
diff --git a/.github/actions/import-ses/action.yaml b/.github/actions/import-ses/action.yaml
index 585f293..579a126 100644
--- a/.github/actions/import-ses/action.yaml
+++ b/.github/actions/import-ses/action.yaml
@@ -6,20 +6,20 @@ inputs:
     required: true
 runs:
   using: 'docker'
-  image: 'docker://soundmonster/kicad-automation-scripts:latest'
-  entrypoint: '/bin/sh'
+  image: 'docker://ghcr.io/inti-cmnb/kicad8_auto:latest'
+  entrypoint: '/bin/bash'
   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
+        echo "Processing $board";
         if [ -e $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb ]; then
-          echo Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb
-          rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb
+          echo "Cleaning up $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb";
+          rm -f $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb;
+        fi
+        if [ -e $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.ses ]; then
+          echo "Import SES";
+          $GITHUB_WORKSPACE/kibot/import_ses.py -b $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb -s $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.ses -o $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb
         fi
-        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.ses --output-file $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}_autorouted.kicad_pcb;
       done
\ No newline at end of file
diff --git a/.github/actions/kibot/action.yaml b/.github/actions/kibot/action.yaml
index fe2d991..89b6cfc 100644
--- a/.github/actions/kibot/action.yaml
+++ b/.github/actions/kibot/action.yaml
@@ -9,14 +9,13 @@ inputs:
     required: true
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/inti-cmnb/kicad7_auto:latest'
+  image: 'docker://ghcr.io/inti-cmnb/kicad8_auto:latest'
   entrypoint: '/bin/bash'
   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;
+        echo "Processing $board";
         kibot -b $GITHUB_WORKSPACE/ergogen/output/pcbs/${board}.kicad_pcb -c $GITHUB_WORKSPACE/kibot/${{ inputs.config }}.kibot.yaml
       done
\ No newline at end of file