From c86cec63236d878a0940b828b3bdf95395eb62b8 Mon Sep 17 00:00:00 2001
From: Tilman Baumann <tilman.baumann@afirix.eu>
Date: Fri, 5 May 2023 16:28:43 +0100
Subject: [PATCH] Consistently use ooutput directory

---
 .github/actions/export-dsn/action.yml     | 4 ----
 .github/actions/export-gerbers/action.yml | 2 +-
 .github/actions/import-ses/action.yml     | 2 +-
 .github/actions/run-drc/action.yml        | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/actions/export-dsn/action.yml b/.github/actions/export-dsn/action.yml
index ec773d6..25679fb 100644
--- a/.github/actions/export-dsn/action.yml
+++ b/.github/actions/export-dsn/action.yml
@@ -17,9 +17,5 @@ runs:
       for board in ${{ inputs.boards }};
       do
         echo Processing $board
-
-        ls -l $GITHUB_WORKSPACE/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/output/pcbs/${board}.dsn
-        find $GITHUB_WORKSPACE/
-        echo /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/export_dsn.py $GITHUB_WORKSPACE/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/output/pcbs/${board}.dsn
         /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/export_dsn.py $GITHUB_WORKSPACE/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/output/pcbs/${board}.dsn
       done
diff --git a/.github/actions/export-gerbers/action.yml b/.github/actions/export-gerbers/action.yml
index 3e13458..cf00875 100644
--- a/.github/actions/export-gerbers/action.yml
+++ b/.github/actions/export-gerbers/action.yml
@@ -21,5 +21,5 @@ runs:
       do
         echo Processing $board
         mkdir -p $GITHUB_WORKSPACE/gerbers/${$board} ;
-        kikit fab ${{ inputs.fab }} ${{ inputs.flags }} $GITHUB_WORKSPACE/pcbs/${board}_routed.kicad_pcb $GITHUB_WORKSPACE/gerbers/${board}
+        kikit fab ${{ inputs.fab }} ${{ inputs.flags }} $GITHUB_WORKSPACE/output/pcbs/${board}_routed.kicad_pcb $GITHUB_WORKSPACE/output/gerbers/${board}
       done
diff --git a/.github/actions/import-ses/action.yml b/.github/actions/import-ses/action.yml
index 73e3fe1..4086777 100644
--- a/.github/actions/import-ses/action.yml
+++ b/.github/actions/import-ses/action.yml
@@ -17,5 +17,5 @@ runs:
       for board in ${{ inputs.boards }};
       do
         echo Processing $board
-        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py $GITHUB_WORKSPACE/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/pcbs/${board}.ses --output-file $GITHUB_WORKSPACE/pcbs/${board}_routed.kicad_pcb;
+        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/import_ses.py $GITHUB_WORKSPACE/output/pcbs/${board}.kicad_pcb $GITHUB_WORKSPACE/output/pcbs/${board}.ses --output-file $GITHUB_WORKSPACE/output/pcbs/${board}_routed.kicad_pcb;
       done
diff --git a/.github/actions/run-drc/action.yml b/.github/actions/run-drc/action.yml
index eecbdbc..cbebb90 100644
--- a/.github/actions/run-drc/action.yml
+++ b/.github/actions/run-drc/action.yml
@@ -16,9 +16,9 @@ runs:
       cp /root/.config/kicad/* $HOME/.config/kicad ;
       for board in ${{ inputs.boards }};
       do
-        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/run_drc.py $GITHUB_WORKSPACE/pcbs/${{ $board }}_routed.kicad_pcb $GITHUB_WORKSPACE/pcbs/${{ board }}-drc/
+        /usr/lib/python2.7/dist-packages/kicad-automation/pcbnew_automation/run_drc.py $GITHUB_WORKSPACE/output/pcbs/${{ $board }}_routed.kicad_pcb $GITHUB_WORKSPACE/output/pcbs/${{ board }}-drc/
         echo "## DRC result $board" >> "$GITHUB_STEP_SUMMARY"
         echo '```' >> "$GITHUB_STEP_SUMMARY"
-        cat $GITHUB_WORKSPACE/pcbs/${{ board }}-drc/drc_result.rpt >> "$GITHUB_STEP_SUMMARY"
+        cat $GITHUB_WORKSPACE/output/pcbs/${{ board }}-drc/drc_result.rpt >> "$GITHUB_STEP_SUMMARY"
         echo '```' >> "$GITHUB_STEP_SUMMARY"
       done