From 5c55da537e9e353d9e24dca945941e6659daea77 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Tue, 16 Apr 2024 12:16:29 +0200 Subject: [PATCH 1/4] update yaml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 187b0b8..3399960 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: net use S: /delete SLEEP 2 net use S: $env:NET_SHARE_S /u:$env:NET_USERQ $SDRIVE_PASSWD - ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin" + ROBOCOPY /MIR $env:BASE_PATH S:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\ /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use S: /delete @@ -37,6 +37,7 @@ variables: net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin" ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /XD "bin" + ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use R: /delete From 34d1b6ea9c3a68d3f4d76d40057ae528cca4e590 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Tue, 16 Apr 2024 13:07:13 +0200 Subject: [PATCH 2/4] update yaml --- .gitlab-ci.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3399960..eda267d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,9 @@ variables: net use R: /delete SLEEP 2 net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD + echo "-----------------------" + echo " Copia macchina su R" + echo "-----------------------" ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin" ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /XD "bin" ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" @@ -47,6 +50,9 @@ variables: net use R: /delete SLEEP 2 net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD + echo "-----------------------" + echo " Recupero file non git da R e copia su macchina virtuale" + echo "-----------------------" ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode" ROBOCOPY "$env:LAST_MACHINE_PATH" "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode" SLEEP 2 @@ -55,14 +61,19 @@ variables: # helper compilazione LUA a 32 e 64 bit .LuaCompile: &LuaCompile - | + Set-Alias lua54 C:\Tools\Lua32\luac54 - echo "Copia file preliminare" + echo "-----------------------" + echo " Copia file su macchina virtuale" + echo "-----------------------" ROBOCOPY . "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode" ROBOCOPY . "$env:TEST_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode" Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.mlde" -NewName "$env:MACH_NAME_TEST.mlde" Rename-Item -Path "$env:TEST_PATH\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini" ROBOCOPY . "$env:SRC_PATH\bin\$env:MACH_NAME\" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt" /XD ".vscode" - echo "Compilazione file *.lua 32/64bit" + echo "-----------------------" + echo " Compilazione file *.lua 32/64bit" + echo "-----------------------" $FileList = Get-ChildItem("Common-*") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf @@ -73,6 +84,9 @@ variables: # helper recupero nome macchina .machName-fix: &machName-fix - | + echo "-----------------------" + echo " Recupero nome macchina" + echo "-----------------------" $fileName = dir *.mlde $env:MACH_NAME = $fileName.BaseName $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST" @@ -80,6 +94,9 @@ variables: # helper calcolo versione .version-fix: &version-fix - | + echo "-----------------------" + echo " Calcolo versione" + echo "-----------------------" $fPath = "$env:MACH_NAME.mlde"; $vLine = Select-String -path $fPath -Pattern 'PP_VER'; $comp = $vLine -split "="; @@ -90,6 +107,9 @@ variables: # helper creazione folders .folder-fix: &folder-fix - | + echo "-----------------------" + echo " Creazione cartelle su macchina virtuale" + echo "-----------------------" $env:LAST_MACHINE_PATH = "$env:MACHINES_PATH_R\$env:MACH_NAME"; Write-Output $env:LAST_MACHINE_PATH; $env:SRC_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME"; @@ -102,6 +122,7 @@ variables: # helper compressione e pulizia folders .ZipClean: &ZipClean - | + " Compressione file su macchina virtuale" $7zipPath = $env:ProgramFiles+"\7-Zip\7z.exe"; if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { throw "7 zip file '$7zipPath' not found" @@ -141,7 +162,6 @@ LuaCompile:build: - *CreateBaseFolder - *LuaCompile - *ZipClean - - *ReplicaS - *ReplicaR # LuaCompile:test: From 313a621eab131281ebf15e4b601a0bae86112864 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Tue, 16 Apr 2024 13:15:17 +0200 Subject: [PATCH 3/4] update yaml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eda267d..95fecc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ variables: echo " Copia macchina su R" echo "-----------------------" ROBOCOPY /MIR "$env:SRC_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME\" /XD "bin" - ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /XD "bin" + ROBOCOPY "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /E /XD "bin" ROBOCOPY /MIR "$env:BASE_PATH" "$env:DEST_MACHINES_PATH_R\Deploy\$env:MACH_NAME\$env:MACH_VERS\" /XD "bin" /XD "$env:MACH_NAME_TEST" SLEEP 2 net use R: /delete From 5146f304b64df262b27cb4c5eed07b2877701e11 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Tue, 16 Apr 2024 15:05:01 +0200 Subject: [PATCH 4/4] yaml lanciato solo per master --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95fecc3..59a00a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,7 +151,6 @@ LuaCompile:build: only: - main - master - - develop tags: - win before_script: