From 78ed444e9d849940ad9082cc46e4712270ef4369 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 1 Jul 2019 11:44:59 -0400 Subject: [PATCH] bundle folder name is broken :( --- misc/jenkins/compile_other_versions/build_version.bat | 10 ++++++---- .../build_current_bundle.bat | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/misc/jenkins/compile_other_versions/build_version.bat b/misc/jenkins/compile_other_versions/build_version.bat index 91cbd228cf..d44731f016 100644 --- a/misc/jenkins/compile_other_versions/build_version.bat +++ b/misc/jenkins/compile_other_versions/build_version.bat @@ -3,11 +3,13 @@ echo Entering %script_name% with %bundle_name% rm -rf temp -set folder=snapshot_%date:~10%%date:~4,2%%date:~7,2%_%time:~0,2%%time:~3,2%_%bundle_name%_rusefi -set folder=temp\%folder% +rem This depends on Cygwin date copied under 'datecyg' name to avoid conflict with Windows date +rem By the way, '%%' is the way to escape % in batch files +rem this is copy-pasted at build_current_bundle.bat +for /f %%i in ('datecyg +%%Y%%m%%d_%%H%%M%%S') do set TIMESTAMP=%%i -rem this replaces spaces with 0s - that's needed before 10am -set folder=%folder: =0% +set folder=snapshot_%TIMESTAMP%_%bundle_name%_rusefi +set folder=temp\%folder% echo Packaging temp\rusefi_bundle.zip file call misc\jenkins\build_working_folder.bat 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 80a73fc7ed..0f40c04912 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 @@ -74,6 +74,7 @@ mkdir temp set stm_arch=stm32f407 rem This depends on Cygwin date copied under 'datecyg' name to avoid conflict with Windows date rem By the way, '%%' is the way to escape % in batch files +rem this is copy-pasted at build_version.bat for /f %%i in ('datecyg +%%Y%%m%%d_%%H%%M%%S') do set TIMESTAMP=%%i set folder=snapshot_%TIMESTAMP%_%stm_arch%_rusefi