From ea94aadb13e7cd1e64959cf4ab757e80391fe811 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Mon, 23 Oct 2023 19:03:23 +1000
Subject: [PATCH] Don't cd into dir when using kibot, makes paths easier to
 deal with

---
 default.kibot.yaml | 2 +-
 kibot-ci.yml       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/default.kibot.yaml b/default.kibot.yaml
index f4c7d59..29365c3 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -88,7 +88,7 @@ outputs:
     options:
       xlsx:
         # this is a relative path unfortunately
-        logo: "../.gitlab/micromelon_default/meta/icon.png"
+        logo: ".gitlab/micromelon_default/meta/icon.png"
         hide_pcb_info: true
         hide_stats_info: true
       format: "XLSX"
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 215d774..5b3570b 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -54,6 +54,7 @@ image:
     - !reference [.commands, sch_from_pro]  
     - sch_arr=($SCHEMS)
     - |
+          cd $CI_PROJECT_DIR
           for i in $(seq 1 $END)
             do
               if [[ ${dir_arr[i-1]} == "./Frame" ]]; then
@@ -62,9 +63,7 @@ image:
               echo ${dir_arr[i-1]} 
               echo ${sch_arr[i-1]} 
               python3 $CI_PROJECT_DIR/.gitlab/.scripts/orig.py ${dir_arr[i-1]}
-              cd ${dir_arr[i-1]}
-              kibot -e ${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/default.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} -s $SUFFIX
-              cd $CI_PROJECT_DIR
+              kibot -e ${dir_arr[i-1]}/${sch_arr[i-1]} -c $CI_PROJECT_DIR/.gitlab/default.kibot.yaml -d $CI_PROJECT_DIR/Fabrication/${dir_arr[i-1]} -s $SUFFIX
             done
     - cd $CI_PROJECT_DIR