custom FW repos code generation process #5817

fail fast and fail often!
rusefi · Dec 20, 2023 · 4e6b1a3 · 4e6b1a3
1 parent 63f18a8
commit 4e6b1a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build-firmware.yaml b/.github/workflows/build-firmware.yaml
@@ -530,7 +530,7 @@ jobs:
 
     - name: Package Bundle
       if: ${{ env.full == 'true' }}
-      run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} "rusefi_${{matrix.short-board-name}}.ini" ${{ github.ref_name }} ${{ toJSON(inputs.lts) }}
+      run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{matrix.build-target}} "firmware/tunerstudio/generated/rusefi_${{matrix.short-board-name}}.ini" ${{ github.ref_name }} ${{ toJSON(inputs.lts) }}
 
     - name: Add Bundles to Release
       if: ${{ env.full == 'true' && env.upload == 'release' }}

diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 #
 # file build_working_folder.sh
 #
@@ -58,20 +60,21 @@ fi
 cp java_console_binary/rusefi_autoupdate.jar $CONSOLE_FOLDER
 cp java_console_binary/rusefi_console.jar $CONSOLE_FOLDER
 cp java_tools/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar $FOLDER
-cp simulator/build/rusefi_simulator.exe   $CONSOLE_FOLDER
+if [ -f simulator/build/rusefi_simulator.exe ]; then
+     cp simulator/build/rusefi_simulator.exe   $CONSOLE_FOLDER
+fi
 cp misc/console_launcher/rusefi_autoupdate.exe     $CONSOLE_FOLDER
 cp misc/console_launcher/rusefi_console.exe     $CONSOLE_FOLDER
 cp misc/console_launcher/rusefi_updater.exe     $FOLDER
 cp misc/console_launcher/update-ts-cacerts/* $update_ts_cacerts_FOLDER
 cp java_console/*.dll                     $CONSOLE_FOLDER
-cp java_console/rusefi.xml                $CONSOLE_FOLDER
 cp -r java_console/bin                    $FOLDER
 cp firmware/ext/openblt/Host/BootCommander.exe $OPENBLT_FOLDER
 cp firmware/ext/openblt/Host/libopenblt.dll    $OPENBLT_FOLDER
 
 cp misc/console_launcher/readme.html      $FOLDER
 
-cp firmware/tunerstudio/generated/$INI_FILE_OVERRIDE $FOLDER
+cp $INI_FILE_OVERRIDE $FOLDER
 # Unsetting since would not be used anywhere else
 INI_FILE_OVERRIDE=""
 RUSEFI_CONSOLE_SETTINGS=""

diff --git a/misc/jenkins/compile_other_versions/prepare_bundle.sh b/misc/jenkins/compile_other_versions/prepare_bundle.sh
@@ -1,12 +1,15 @@
 #!/bin/bash
 
+set -e
+
 BUNDLE_NAME="$1"
 export INI_FILE_OVERRIDE="$2"
 REF_NAME=$3
 LTS=$4
 
 SCRIPT_NAME="prepare_bundle.sh"
 echo "Entering $SCRIPT_NAME with ${BUNDLE_NAME}"
+pwd
 echo "RUSEFI_BUILD_FTP_USER=$RUSEFI_BUILD_FTP_USER"
 
 TIMESTAMP=$(date "+%Y%m%d_%H%M%S")