andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bundle folder name is broken :(

This commit is contained in:
rusefi 2019-07-01 12:22:58 -04:00
parent 78ed444e9d
commit 2d78071330
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/jenkins/functional_test_and_build_bundle/build_current_bundle.bat
View File

@ -85,7 +85,7 @@ echo "%script_name%: folder variable3=%folder%"
pwd pwd
call misc\jenkins\build_working_folder.bat call misc\jenkins\build_working_folder.bat
IF NOT ERRORLEVEL 0 ( IF NOT ERRORLEVEL 0 (
echo %script_name%: ERROR invoking build_working_folder.bat echo %script_name%: ERROR: invoking build_working_folder.bat
EXIT /B 1 EXIT /B 1
) )
@ -107,11 +107,9 @@ echo "%script_name%: Making rusefi_simulator.zip"
pwd pwd
zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar zip -j temp/rusefi_simulator.zip simulator/build/rusefi_simulator.exe firmware/tunerstudio/rusefi.ini java_console_binary/rusefi_console.jar
cd temps cd temp
if not exist rusefi_bundle.zip ( if not exist rusefi_bundle.zip echo %script_name%: ERROR not found rusefi_bundle.zip
echo %script_name%: not found rusefi_bundle.zip if not exist rusefi_bundle.zip EXIT /B 1
EXIT /B 1
)
echo "%script_name%: Uploading stuff" echo "%script_name%: Uploading stuff"
ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle.zip ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% . rusefi_bundle.zip

12
misc/jenkins/unit_tests/unit_tests.bat
View File

@ -15,12 +15,12 @@ git submodule update --init
rm -fR .dep rm -fR .dep
rm -fR build rm -fR build
call update_version.bat call update_version.bat
IF NOT ERRORLEVEL 0 echo ERROR INVOKING VERSION HEADER GENERATOR IF NOT ERRORLEVEL 0 echo ERROR: INVOKING VERSION HEADER GENERATOR
IF NOT ERRORLEVEL 0 EXIT /B 1 IF NOT ERRORLEVEL 0 EXIT /B 1
make -j6 make -j6
if not exist build/rusefi.hex echo FAILED TO COMPILE FIRMWARE if not exist build/rusefi.hex echo ERROR: FAILED TO COMPILE FIRMWARE
if not exist build/rusefi.hex exit -1 if not exist build/rusefi.hex exit -1
cd .. cd ..
@ -33,14 +33,14 @@ rem Only here we are building unit_tests
call compile.bat call compile.bat
pwd pwd
ls -l build ls -l build
if not exist build/rusefi_test.exe echo FAILED TO COMPILE UNIT TESTS if not exist build/rusefi_test.exe echo ERROR: FAILED TO COMPILE UNIT TESTS
if not exist build/rusefi_test.exe exit -1 if not exist build/rusefi_test.exe exit -1
echo "TIMESTAMP %date% %time% Unit tests build looks good, now executing unit tests" echo "TIMESTAMP %date% %time% Unit tests build looks good, now executing unit tests"
cd build cd build
call rusefi_test.exe call rusefi_test.exe
IF NOT ERRORLEVEL 0 echo UNIT TEST FAILED IF NOT ERRORLEVEL 0 echo ERROR: UNIT TEST FAILED
IF NOT ERRORLEVEL 0 EXIT /B 1 IF NOT ERRORLEVEL 0 EXIT /B 1
cd .. cd ..
@ -53,11 +53,11 @@ pwd
echo Preparing firmware-only fast upload echo Preparing firmware-only fast upload
zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini zip -j firmware/build/rusefi_firmware.zip firmware/svnversion.h firmware/build/rusefi.hex firmware/build/rusefi.bin firmware/build/rusefi.elf firmware/tunerstudio/rusefi.ini
IF NOT ERRORLEVEL 0 echo Invoking ZIP has failed IF NOT ERRORLEVEL 0 echo ERROR: Invoking ZIP has failed
IF NOT ERRORLEVEL 0 EXIT /B 1 IF NOT ERRORLEVEL 0 EXIT /B 1
echo "TIMESTAMP %date% %time% Now uploading only firmware echo "TIMESTAMP %date% %time% Now uploading only firmware
ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files firmware/build/rusefi_firmware.zip ncftpput -u %RUSEFI_BUILD_FTP_USER% -p %RUSEFI_BUILD_FTP_PASS% %FTP_SERVER% separate_files firmware/build/rusefi_firmware.zip
IF NOT ERRORLEVEL 0 echo Invoking ncftpput has failed IF NOT ERRORLEVEL 0 echo ERROR: Invoking ncftpput has failed
IF NOT ERRORLEVEL 0 EXIT /B 1 IF NOT ERRORLEVEL 0 EXIT /B 1