From 0da52d2a5a9dbe3248c25efbf6b652d72e86db9c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 1 Apr 2022 10:12:27 +0200 Subject: [PATCH 1/4] Aggiunta replica script in area NAS --- .gitlab-ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4def7d..c613a55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,9 @@ variables: NEW_REL: '' NET_SHARE: '\\10.74.82.50\EgtTech' NET_USER: '10.74.82.50\Server' + NET_SHARE_2: '\\10.74.82.201\Artifacts' -#Note compilaizone LUA: +#Note compilazione LUA: # lua53 -o 32\$FileName -s $FileName: -o = output, -s = NON include i debug symbols # versioni compilazione ANCHE script esterni / eliminati @@ -59,13 +60,21 @@ variables: # helper copia script verso cartella di rete R:\ delle cartelle 32 e 64 .ReplicaCompiled: &ReplicaCompiled - | + net use R: /delete + net use Z: /delete net use R: $env:NET_SHARE /u:$env:NET_USER $RDRIVE_PASSWD + net use Z: $env:NET_SHARE_2 ROBOCOPY /MIR 32 R:\EgtData\Beam\32 ROBOCOPY /MIR 64 R:\EgtData\Beam\64 ROBOCOPY /MIR Images R:\EgtData\Beam\32\Images ROBOCOPY /MIR Images R:\EgtData\Beam264\Images + ROBOCOPY /MIR 32 Z:\EgtData\Beam\32 + ROBOCOPY /MIR 64 Z:\EgtData\Beam\64 + ROBOCOPY /MIR Images Z:\EgtData\Beam\32\Images + ROBOCOPY /MIR Images Z:\EgtData\Beam264\Images SLEEP 2 net use R: /delete + net use Z: /delete stages: - build From 1a887655002aee46e94f9fb0e248cb6853088444 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 1 Apr 2022 10:17:40 +0200 Subject: [PATCH 2/4] Aggiunto step x branch NON main --- .gitlab-ci.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c613a55..b246ceb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,19 +61,24 @@ variables: .ReplicaCompiled: &ReplicaCompiled - | net use R: /delete - net use Z: /delete net use R: $env:NET_SHARE /u:$env:NET_USER $RDRIVE_PASSWD - net use Z: $env:NET_SHARE_2 ROBOCOPY /MIR 32 R:\EgtData\Beam\32 ROBOCOPY /MIR 64 R:\EgtData\Beam\64 ROBOCOPY /MIR Images R:\EgtData\Beam\32\Images ROBOCOPY /MIR Images R:\EgtData\Beam264\Images + SLEEP 2 + net use R: /delete + +# helper copia script verso cartella di rete R:\ delle cartelle 32 e 64 +.ReplicaZ: &ReplicaZ + - | + net use Z: /delete + net use Z: $env:NET_SHARE_2 ROBOCOPY /MIR 32 Z:\EgtData\Beam\32 ROBOCOPY /MIR 64 Z:\EgtData\Beam\64 ROBOCOPY /MIR Images Z:\EgtData\Beam\32\Images ROBOCOPY /MIR Images Z:\EgtData\Beam264\Images SLEEP 2 - net use R: /delete net use Z: /delete stages: @@ -90,4 +95,16 @@ LuaCompile:build: - *LuaCompile32 - *LuaCompile64 - *ReplicaCompiled + +LuaCompileTest:build: + stage: build + except: + - main + - master + tags: + - win + script: + - *LuaCompile32 + - *LuaCompile64 + - *ReplicaZ # after_script: \ No newline at end of file From a769c2e831f796bdd43bdcd53edf1982a8b3eb5c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 1 Apr 2022 10:19:55 +0200 Subject: [PATCH 3/4] Fix path x img 64 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b246ceb..3b62eef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ variables: ROBOCOPY /MIR 32 R:\EgtData\Beam\32 ROBOCOPY /MIR 64 R:\EgtData\Beam\64 ROBOCOPY /MIR Images R:\EgtData\Beam\32\Images - ROBOCOPY /MIR Images R:\EgtData\Beam264\Images + ROBOCOPY /MIR Images R:\EgtData\Beam\64\Images SLEEP 2 net use R: /delete @@ -77,7 +77,7 @@ variables: ROBOCOPY /MIR 32 Z:\EgtData\Beam\32 ROBOCOPY /MIR 64 Z:\EgtData\Beam\64 ROBOCOPY /MIR Images Z:\EgtData\Beam\32\Images - ROBOCOPY /MIR Images Z:\EgtData\Beam264\Images + ROBOCOPY /MIR Images Z:\EgtData\Beam\64\Images SLEEP 2 net use Z: /delete From 71e762074e79bc4acc9a998bfbfe9ce73ecb1016 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 1 Apr 2022 10:20:30 +0200 Subject: [PATCH 4/4] Anche replica Z in main --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b62eef..0f480e0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ LuaCompile:build: - *LuaCompile32 - *LuaCompile64 - *ReplicaCompiled + - *ReplicaZ LuaCompileTest:build: stage: build