From 048d36745da44d5de85f7287bd85cbc452e99332 Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Fri, 1 Mar 2024 11:30:46 -0800
Subject: [PATCH] more script cleanup

---
 .github/workflows/build-firmware.yaml              |  3 ++-
 misc/jenkins/build_simulator.sh                    | 14 --------------
 misc/jenkins/compile_other_versions/compile.sh     |  3 ---
 .../compile_other_versions/prepare_bundle.bat      |  2 --
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100755 misc/jenkins/build_simulator.sh
 delete mode 100644 misc/jenkins/compile_other_versions/prepare_bundle.bat

diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
index acab976f0d..f96691bfc5 100644
--- a/.github/workflows/build-firmware.yaml
+++ b/.github/workflows/build-firmware.yaml
@@ -311,8 +311,9 @@ jobs:
     # Build the simulator
     - name: Build simulator
       if: ${{ env.full == 'true' }}
+      working-directory: ./simulator/
       # 'OS="Windows_NT"' allows us to build Windows executable on unix
-      run: OS="Windows_NT" SHORT_BOARD_NAME=${{matrix.build-target}} bash misc/jenkins/build_simulator.sh
+      run: OS="Windows_NT" SHORT_BOARD_NAME=${{matrix.build-target}} ./compile.sh
 
     - name: Download LibOpenBLT Tool (Linux)
       uses: actions/download-artifact@v3
diff --git a/misc/jenkins/build_simulator.sh b/misc/jenkins/build_simulator.sh
deleted file mode 100755
index 1bc56d3490..0000000000
--- a/misc/jenkins/build_simulator.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "TIMESTAMP $(date "+%D %T.%2N") Building rusefi simulator"
-pwd
-cd simulator
-gcc -v
-make -v
-mkdir -p out
-rm -rf build
-rm -rf .dep
-bash compile.sh
-ls build
-cd ..
-[ -e simulator/build/fome_simulator.exe ] || [ -e simulator/build/fome_simulator ] || { echo "SIMULATOR COMPILATION FAILED"; exit 1; }
diff --git a/misc/jenkins/compile_other_versions/compile.sh b/misc/jenkins/compile_other_versions/compile.sh
index 9607c4d53f..dada35d01c 100755
--- a/misc/jenkins/compile_other_versions/compile.sh
+++ b/misc/jenkins/compile_other_versions/compile.sh
@@ -13,7 +13,6 @@ SCRIPT_NAME=compile_and_upload.sh
 echo "Entering $SCRIPT_NAME with folder $BOARD_DIR and bundle name $BUNDLE_NAME"
 
 [ -n $BOARD_DIR ] || { echo "BOARD_DIR parameter expected"; exit 1; }
-
 [ -n $BUNDLE_NAME ] || { echo "BUNDLE_NAME parameter expected"; exit 1; }
 
 COMPILE_SCRIPT="compile_$BUNDLE_NAME.sh"
@@ -24,8 +23,6 @@ rm -rf build
 rm -rf pch/pch.h.gch.sh
 cd ..
 
-root_dir=$(pwd)
-
 cd firmware/$BOARD_DIR
 pwd
 echo "Invoking $COMPILE_SCRIPT"
diff --git a/misc/jenkins/compile_other_versions/prepare_bundle.bat b/misc/jenkins/compile_other_versions/prepare_bundle.bat
deleted file mode 100644
index 88928638bf..0000000000
--- a/misc/jenkins/compile_other_versions/prepare_bundle.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-sh.exe prepare_bundle.sh