only:custom FW repos code generation process #5817

handling .ini upload and bundle

.github/workflows/custom-board-build.yaml

@@ -10,9 +10,6 @@ on:
       shortBoardName:
         required: true
         type: string
-      iniFileName:
-        required: true
-        type: string
 
 jobs:
   create-board:
@@ -21,7 +18,7 @@ jobs:
     steps:
       - name: Echo
         run: |
-          echo "shortBoardName=${{inputs.shortBoardName}} iniFileName=${{inputs.iniFileName}}"
+          echo "shortBoardName=${{inputs.shortBoardName}}"
 
       - name: Set Env Variables
         env:
@@ -57,16 +54,6 @@ jobs:
           sudo bash ext/rusefi/misc/actions/add-ubuntu-latest-apt-mirrors.sh
           sudo apt-get install sshpass sshpass mtools
 
-      - name: Removing other .ini files since we will be uploading
-        working-directory: ext/rusefi/
-        run: rm -rf firmware/tunerstudio/generated/*.ini
-
-      - name: Set Output Env
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-        run: |
-          echo "META_OUTPUT_ROOT_FOLDER=../../../generated/" >> $GITHUB_ENV
-
       - name: Gen Config
         working-directory: ext/rusefi/firmware
         run: |
@@ -115,8 +102,8 @@ jobs:
           github_token: ${{ github.token }}
 
       - name: Upload .ini files to server
-        working-directory: ext/rusefi/firmware/tunerstudio/generated
-        run: ../upload_ini.sh ${{env.gha_iniFileName}} ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
+        working-directory: generated/tunerstudio/generated
+        run: ../../../ext/rusefi/firmware/tunerstudio/upload_ini.sh ${{env.gha_iniFileName}} ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
 
       - name: Build Firmware
         working-directory: ext/rusefi
@@ -159,7 +146,7 @@ jobs:
 
       - name: Package and Upload Bundle
         working-directory: ext/rusefi/
-        run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{env.gha_shortBoardName}} ${{env.gha_iniFileName}} master
+        run: bash misc/jenkins/compile_other_versions/prepare_bundle.sh ${{env.gha_shortBoardName}} "generated/tunerstudio/generated/${{env.gha_iniFileName}}" master
 
       - name: Upload bundle artifact
         uses: actions/upload-artifact@v4

misc/jenkins/build_working_folder.sh

@@ -38,11 +38,16 @@ wget https://rusefi.com/build_server/st_files/silent_st_drivers2.exe -P $DRIVERS
 [ -e $DRIVERS_FOLDER/silent_st_drivers2.exe ] || { echo "$SCRIPT_NAME: ERROR DOWNLOADING silent_st_drivers2.exe"; exit 1; }
 
 if [ -z $INI_FILE_OVERRIDE ]; then
-    INI_FILE_OVERRIDE="rusefi.ini"
-    echo "$SCRIPT_NAME: No ini_file_override specified"
+    echo "$SCRIPT_NAME: No ini_file specified!"
+    exit -1
 fi
 echo "$SCRIPT_NAME: Will use $INI_FILE_OVERRIDE"
 
+if [ ! -f $INI_FILE_OVERRIDE ]; then
+   echo "$INI_FILE_OVERRIDE does not exist"
+   exit -1
+fi
+
 if [ -z $RUSEFI_CONSOLE_SETTINGS ]; then
   echo "$SCRIPT_NAME: No rusefi_console_settings"
 else