Merge branch 'develop'

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
  VERS_MAIN: '1.0'
  APP_NAME: '3dPrinting'
  NEW_REL: ''
- NET_SHARE_R: '\\10.74.82.201\EgwTech'
+ NET_SHARE_X: '\\10.74.82.201\EgwTech'
  NET_SHARE_Z: '\\10.74.82.201\Artifacts'
  NET_USERQ: 'steamw\egalware'
 
@@ -29,26 +29,29 @@ 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
+    net use X: /delete
     SLEEP 2
-    net use R: /delete
+    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
 
 
 # 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
+    net use X: /delete
     SLEEP 2
-    net use R: /delete
+    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 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
@@ -62,10 +65,11 @@ LuaCompile:build:
  only:
    - main
    - master
+   - develop
  tags:
    - win
  script:    
    - *LuaCompile
    - *CodeReplicaR
    - *ReplicaR
-   - *ReplicaZ
+#   - *ReplicaZ