From f0b2ce3720ac01d59e26ad677f79b042a730ae2f Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Tue, 16 Apr 2024 10:56:55 +0200
Subject: [PATCH 1/4] yaml: - copia sorgenti e zip compilati in percorso di
 prova in S, ordinati per versione - copia sorgenti in R, in percorso di
 prova, ultima versione macchina e macchina di test

---
 .gitlab-ci.yml | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ca7a0c..449b872 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 variables:
  VERS_MAIN: '1.0'
  MACH_NAME: ''
+ MACH_NAME_TEST: ''
  NEW_REL: ''
  NET_SHARE_X: '\\10.74.82.201\EgwTech'
  NET_SHARE_Z: '\\10.74.82.201\Artifacts'
@@ -8,9 +9,12 @@ variables:
  NET_SHARE_R: '\\10.74.82.201\EgwTech'
  NET_USERQ: 'steamw\egalware'
  MACH_VERS: '0.0.0.0'
- DEPLOY_PATH: 'C:\MachinesDeploy'
+ TEMP_PATH: 'C:\MachinesDeploy'
+ MACHINES_PATH_R: 'R:\EgtData\Machines'
+ DEST_MACHINES_PATH_R: 'R:\EgtData\Machines\zTestYAML'
  SRC_PATH: ''
  BASE_PATH: ''
+ TEST_PATH: ''
 
 #Note compilazione LUA:
 # lua54 -o bin\$FileName -s $FileName: -o = output, -s = NON include i debug symbols
@@ -30,8 +34,20 @@ variables:
    - |
       net use R: /delete
       SLEEP 2
-      net use R: $env:NET_SHARE_S /u:$env:NET_USERQ $SDRIVE_PASSWD
-      ROBOCOPY /MIR $env:BASE_PATH R:\LucaM\MachinesDeploy\$env:MACH_NAME\$env:MACH_VERS\
+      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 /MIR "$env:TEST_PATH" "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\" /XD "bin"
+      SLEEP 2
+      net use R: /delete
+
+#helper copia sorgenti da R a percorso temporaneo
+.CreateBaseFolder: &CreateBaseFolder
+- |   
+      net use R: /delete
+      SLEEP 2
+      net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
+      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
       net use R: /delete
 
@@ -40,7 +56,8 @@ variables:
   - |
     Set-Alias lua54  C:\Tools\Lua32\luac54
     echo "Copia file preliminare"
-    ROBOCOPY . "$env:SRC_PATH" /E /XF "*.bat" /XF "*.yml" /XF ".gitignore" /XD ".git" /XF "UpdateLog.txt"
+    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"
     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"
     $FileList = Get-ChildItem("Common-*")
@@ -55,6 +72,7 @@ variables:
    - |
       $fileName = dir *.mlde
       $env:MACH_NAME = $fileName.BaseName
+      $env:MACH_NAME_TEST = $env:MACH_NAME + ".TEST"
 
 # helper calcolo versione
 .version-fix: &version-fix
@@ -69,10 +87,14 @@ variables:
 # helper creazione folders 
 .folder-fix: &folder-fix
    - |
-      $env:SRC_PATH = "$env:DEPLOY_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME";
-      $env:BASE_PATH = "$env:DEPLOY_PATH\$env:MACH_NAME\$env:MACH_VERS";
+      $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";
+      $env:BASE_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS";
+      $env:TEST_PATH = "$env:TEMP_PATH\$env:MACH_NAME\$env:MACH_VERS\$env:MACH_NAME_TEST";
       Write-Output  $env:BASE_PATH;     
       if (Test-Path $env:BASE_PATH) { Remove-Item -Path "$env:BASE_PATH\*" -R -Force };
+      Write-Output  $env:TEST_PATH;
 
 # helper compressione e pulizia folders 
 .ZipClean: &ZipClean
@@ -112,10 +134,12 @@ LuaCompile:build:
    - *machName-fix
    - *version-fix
    - *folder-fix
- script:    
+ script:
+   - *CreateBaseFolder    
    - *LuaCompile
    - *ZipClean
    - *ReplicaS
+   - *ReplicaR
 
 # LuaCompile:test:
 #  stage: test

From b660adc8e8e0c5e7eae67e38c77c2a4559b4d1cf Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Tue, 16 Apr 2024 11:01:04 +0200
Subject: [PATCH 2/4] modifica yaml e test

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 449b872..760927d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ variables:
       SLEEP 2
       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 /MIR "$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\" /XD "bin"
       SLEEP 2
       net use R: /delete
 

From cb1f97ba3bdf159db2e252662570fe38de2046db Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Tue, 16 Apr 2024 11:25:16 +0200
Subject: [PATCH 3/4] modifica yaml e test

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 760927d..cc3ee1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ 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"
+      Rename-Item -Path "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\$env:MACH_NAME.mlde" -NewName "$env:MACH_NAME_TEST.mlde"
+      Rename-Item -Path "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini"
       SLEEP 2
       net use R: /delete
 

From 6f52a41cb09ecdf39fe9e44ff636a81fddee59d9 Mon Sep 17 00:00:00 2001
From: "luca.mazzoleni" <luca.mazzoleni@egalware.com>
Date: Tue, 16 Apr 2024 11:34:59 +0200
Subject: [PATCH 4/4] modifica yaml e test

---
 .gitlab-ci.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc3ee1c..187b0b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,14 +37,12 @@ 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"
-      Rename-Item -Path "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\$env:MACH_NAME.mlde" -NewName "$env:MACH_NAME_TEST.mlde"
-      Rename-Item -Path "$env:DEST_MACHINES_PATH_R\$env:MACH_NAME_TEST\$env:MACH_NAME.ini" -NewName "$env:MACH_NAME_TEST.ini"
       SLEEP 2
       net use R: /delete
 
 #helper copia sorgenti da R a percorso temporaneo
 .CreateBaseFolder: &CreateBaseFolder
-- |   
+   - |   
       net use R: /delete
       SLEEP 2
       net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
@@ -56,18 +54,20 @@ variables:
 # helper compilazione LUA a 32 e 64 bit
 .LuaCompile: &LuaCompile
   - |
-    Set-Alias lua54  C:\Tools\Lua32\luac54
-    echo "Copia file preliminare"
-    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"
-    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"
-    $FileList = Get-ChildItem("Common-*")
-    ForEach ($File in $FileList) {
-      $FileName = Split-Path $File -leaf
-      lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName
-      echo "lua54 -o bin\$FileName -s $FileName"
-    }
+     Set-Alias lua54  C:\Tools\Lua32\luac54
+     echo "Copia file preliminare"
+     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"
+     $FileList = Get-ChildItem("Common-*")
+     ForEach ($File in $FileList) {
+       $FileName = Split-Path $File -leaf
+       lua54 -o $env:SRC_PATH\bin\$env:MACH_NAME\$FileName -s $FileName
+       echo "lua54 -o bin\$FileName -s $FileName"
+     }
 
 # helper recupero nome macchina
 .machName-fix: &machName-fix