From 1ad2b83ce2b253848eaefa2f198dfe5c9385f125 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 6 Jun 2020 17:17:33 -0400 Subject: [PATCH] bundle_name.ini --- misc/jenkins/build_working_folder.bat | 2 ++ misc/jenkins/compile_other_versions/prepare_bundle.bat | 3 ++- .../functional_test_and_build_bundle/build_current_bundle.bat | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/misc/jenkins/build_working_folder.bat b/misc/jenkins/build_working_folder.bat index 0fe84870a9..c357593003 100644 --- a/misc/jenkins/build_working_folder.bat +++ b/misc/jenkins/build_working_folder.bat @@ -1,6 +1,8 @@ set script_name=build_working_folder.bat echo Entering %script_name% +echo %bundle_file% > temp/bundle_name.ini + pwd echo %script_name%: Working folder: %folder% mkdir %folder% diff --git a/misc/jenkins/compile_other_versions/prepare_bundle.bat b/misc/jenkins/compile_other_versions/prepare_bundle.bat index 621ac9211b..124df06d6e 100644 --- a/misc/jenkins/compile_other_versions/prepare_bundle.bat +++ b/misc/jenkins/compile_other_versions/prepare_bundle.bat @@ -16,11 +16,12 @@ for /f %%i in ('datecyg +%%Y%%m%%d_%%H%%M%%S') do set TIMESTAMP=%%i set folder=snapshot_%TIMESTAMP%_%bundle_name%_rusefi set folder=temp\%folder% +set bundle_file=rusefi_bundle_%bundle_name%.zip + echo Packaging temp\rusefi_bundle.zip file call misc\jenkins\build_working_folder.bat cd temp -set bundle_file=rusefi_bundle_%bundle_name%.zip mv rusefi_bundle.zip %bundle_file% echo Uploading %bundle_file% diff --git a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat index 9cbea2c756..9af942e24a 100644 --- a/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat +++ b/misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat @@ -80,6 +80,7 @@ set folder=temp\%folder% echo "%script_name%: folder variable3=%folder%" pwd +set bundle_file=rusefi_bundle.zip call misc\jenkins\build_working_folder.bat IF NOT ERRORLEVEL 0 ( echo %script_name%: ERROR: invoking build_working_folder.bat @@ -104,7 +105,7 @@ cd temp if not exist rusefi_bundle.zip echo %script_name%: ERROR not found rusefi_bundle.zip if not exist rusefi_bundle.zip EXIT /B 1 echo "%script_name%: Uploading stuff" -ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% . rusefi_bundle.zip +ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %RUSEFI_FTP_SERVER% . %bundle_file% cd ..