From 439d48b3808352267ce001816e08cf43d443cbd2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:29:56 +0100 Subject: [PATCH 1/6] update yaml gestione interfacce di rete --- .gitlab-ci.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2024050..ab216b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ variables: VERS_MAIN: '1.0' APP_NAME: '3dPrinting' NEW_REL: '' - NET_SHARE_R: '\\10.74.82.201\EgwTech' NET_SHARE_Z: '\\10.74.82.201\Artifacts' NET_USERQ: 'steamw\egalware' @@ -29,30 +28,23 @@ variables: # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI .CodeReplicaR: &CodeReplicaR - | - net use R: /delete - net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY . R:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git - SLEEP 2 - net use R: /delete # helper copia script verso cartella di rete R:\ delle cartelle bin .ReplicaR: &ReplicaR - | - net use R: /delete - net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR bin R:\EgtData\$env:APP_NAME\bin - SLEEP 2 - net use R: /delete -# helper copia script verso cartella di rete R:\ delle cartelle bin +# helper copia script verso cartella di rete Z:\ delle cartelle bin .ReplicaZ: &ReplicaZ - | net use Z: /delete + SLEEP 2 net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin - SLEEP 2 - net use Z: /delete +# SLEEP 2 +# net use Z: /delete stages: - build @@ -68,4 +60,4 @@ LuaCompile:build: - *LuaCompile - *CodeReplicaR - *ReplicaR - - *ReplicaZ +# - *ReplicaZ From 7d026726d62e95e0bb75cdba4621eed20cdea38f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:30:31 +0100 Subject: [PATCH 2/6] test develop compile --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab216b0..d6136df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,7 @@ LuaCompile:build: only: - main - master + - develop tags: - win script: From 2914862a15c9e20ec15349f5f285e36907cc4374 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:41:23 +0100 Subject: [PATCH 3/6] aggiunto escape nel path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6136df..0eac508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI .CodeReplicaR: &CodeReplicaR - | - ROBOCOPY . R:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git + ROBOCOPY . R:\EgtData\$env:APP_NAME\ /MIR /XF .git* /XD .git # helper copia script verso cartella di rete R:\ delle cartelle bin From 82f61af2a3a5bf6185ab1041df2e04d39317313e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:43:48 +0100 Subject: [PATCH 4/6] sintassi alternativa x net share --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0eac508..6d5215b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: VERS_MAIN: '1.0' APP_NAME: '3dPrinting' NEW_REL: '' + NET_SHARE_X: '\\10.74.82.201\EgwTech' NET_SHARE_Z: '\\10.74.82.201\Artifacts' NET_USERQ: 'steamw\egalware' @@ -28,7 +29,12 @@ variables: # helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI .CodeReplicaR: &CodeReplicaR - | - ROBOCOPY . R:\EgtData\$env:APP_NAME\ /MIR /XF .git* /XD .git + net use X: /delete + SLEEP 2 + net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD -persist + ROBOCOPY . X:\EgtData\$env:APP_NAME\ /MIR /XF .git* /XD .git + SLEEP 2 + net use X: /delete # helper copia script verso cartella di rete R:\ delle cartelle bin From eca66a82bfa563fca84d295ba5d1c84372bac456 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:44:41 +0100 Subject: [PATCH 5/6] typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d5215b..ae2fa5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ variables: - | net use X: /delete SLEEP 2 - net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD -persist + net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY . X:\EgtData\$env:APP_NAME\ /MIR /XF .git* /XD .git SLEEP 2 net use X: /delete From 90a8b558b957697ddb5e9cf8ac673edf7fdb84d5 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Mar 2023 12:45:43 +0100 Subject: [PATCH 6/6] fix script netuse --- .gitlab-ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae2fa5d..187a21b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,12 @@ variables: # helper copia script verso cartella di rete R:\ delle cartelle bin .ReplicaR: &ReplicaR - | - ROBOCOPY /MIR bin R:\EgtData\$env:APP_NAME\bin + net use X: /delete + SLEEP 2 + net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD + ROBOCOPY /MIR bin X:\EgtData\$env:APP_NAME\bin + SLEEP 2 + net use X: /delete # helper copia script verso cartella di rete Z:\ delle cartelle bin .ReplicaZ: &ReplicaZ @@ -49,8 +54,8 @@ variables: SLEEP 2 net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin -# SLEEP 2 -# net use Z: /delete + SLEEP 2 + net use Z: /delete stages: - build