diff --git a/.gitignore b/.gitignore index 1017e67..196fc23 100644 --- a/.gitignore +++ b/.gitignore @@ -15,12 +15,3 @@ /Wall/PocketingData.lua /Wall/SawingData.lua /Wall/Ts3Data.lua -/.vscode -/MachNotes.ini -/ToolNotes.ini - -# ignoro file bak nella cartella principale e nelle sottocartelle al primo livello -*.bak -/*/*.bak - -Wall/SurfacingData.lua diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6ec408..450874d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ variables: echo "-----------------------" $customerPathR = $env:MACHINES_PATH_R + "\" + $env:MANUFACTURER ROBOCOPY /MIR "$env:SRC_PATH" "$customerPathR\$env:MACH_NAME\" /XD "bin" - ROBOCOPY "$env:TEST_PATH" "$customerPathR\_TestMachines\$env:MACH_NAME\$env:MACH_NAME_TEST\" /E /XD "bin" + ROBOCOPY "$env:TEST_PATH" "$customerPathR\_TestMachines\$env:MACH_NAME_TEST\" /E /XD "bin" ROBOCOPY /MIR "$env:BASE_PATH" "$customerPathR\_Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use R: /delete