diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5170f603..d1c354f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ variables: # ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools' # EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release' # DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds' -# VERS_MAIN: '1.0' # NEW_REL: '' + VERS_MAIN: '1.0' NEXUS_PATH: 'MP-STATS' APP_NAME: 'MP.Stats' @@ -37,7 +37,9 @@ variables: .nexusUpload: &nexusUpload - | Set-Alias mCurl C:\Windows\system32\curl.exe - $VersNumb = Get-Content "VersNum.txt" + $currentDate = get-date -format yyMM; + $currentTime = get-date -format ddHH; + $VersNumb = $env:VERS_MAIN + "." + $currentDate +"." + $currentTime if($CI_COMMIT_BRANCH -eq "master") { $version = "stable" @@ -49,8 +51,8 @@ variables: $File2Send = Get-ChildItem($env:APP_NAME + "\bin\publish\*") ForEach ($File in $File2Send) { $FileName = Split-Path $File -leaf - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$FileName - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$VersNum/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File http://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNum/$FileName } # mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip