diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f480e0..dd5dbf7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ variables: VERS_MAIN: '0.9' NEW_REL: '' - NET_SHARE: '\\10.74.82.50\EgtTech' + NET_SHARE_R: '\\10.74.82.50\EgtTech' NET_USER: '10.74.82.50\Server' - NET_SHARE_2: '\\10.74.82.201\Artifacts' + NET_SHARE_Z: '\\10.74.82.201\Artifacts' #Note compilazione LUA: # lua53 -o 32\$FileName -s $FileName: -o = output, -s = NON include i debug symbols @@ -26,7 +26,7 @@ variables: # helper compilazione LUA a 32 bit .LuaCompile32: &LuaCompile32 - | - Set-Alias lua53 LuaDll_32\luac53 + Set-Alias lua53 C:\Tools\Lua32\luac53 $FileList = Get-ChildItem("*.lua") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf @@ -43,7 +43,7 @@ variables: # helper compilazione LUA a 64 bit .LuaCompile64: &LuaCompile64 - | - Set-Alias lua53 LuaDll_64\luac53 + Set-Alias lua53 C:\Tools\Lua64\luac53 $FileList = Get-ChildItem("*.lua") ForEach ($File in $FileList) { $FileName = Split-Path $File -leaf @@ -58,10 +58,10 @@ variables: } # helper copia script verso cartella di rete R:\ delle cartelle 32 e 64 -.ReplicaCompiled: &ReplicaCompiled +.ReplicaR: &ReplicaR - | net use R: /delete - net use R: $env:NET_SHARE /u:$env:NET_USER $RDRIVE_PASSWD + net use R: $env:NET_SHARE_R /u:$env:NET_USER $RDRIVE_PASSWD ROBOCOPY /MIR 32 R:\EgtData\Beam\32 ROBOCOPY /MIR 64 R:\EgtData\Beam\64 ROBOCOPY /MIR Images R:\EgtData\Beam\32\Images @@ -73,7 +73,7 @@ variables: .ReplicaZ: &ReplicaZ - | net use Z: /delete - net use Z: $env:NET_SHARE_2 + net use Z: $env:NET_SHARE_Z ROBOCOPY /MIR 32 Z:\EgtData\Beam\32 ROBOCOPY /MIR 64 Z:\EgtData\Beam\64 ROBOCOPY /MIR Images Z:\EgtData\Beam\32\Images @@ -94,18 +94,18 @@ LuaCompile:build: script: - *LuaCompile32 - *LuaCompile64 - - *ReplicaCompiled + - *ReplicaR - *ReplicaZ -LuaCompileTest:build: - stage: build - except: - - main - - master - tags: - - win - script: - - *LuaCompile32 - - *LuaCompile64 - - *ReplicaZ -# after_script: \ No newline at end of file +#LuaCompileTest:build: +# stage: build +# except: +# - main +# - master +# tags: +# - win +# script: +# - *LuaCompile32 +# - *LuaCompile64 +# - *ReplicaZ +## after_script: \ No newline at end of file diff --git a/LuaDll_32/luac53.exe b/LuaDll_32/luac53.exe deleted file mode 100644 index ec0d478..0000000 Binary files a/LuaDll_32/luac53.exe and /dev/null differ diff --git a/LuaDll_64/luac53.exe b/LuaDll_64/luac53.exe deleted file mode 100644 index 9a661ca..0000000 Binary files a/LuaDll_64/luac53.exe and /dev/null differ