diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7031f27f..7bb23fe2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,11 +53,11 @@ 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 https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/$FileName - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/$VersNumb/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName } - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/manifest.xml - mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/0/ChangeLog.html + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml + mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "$env:APP_NAME\Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html # 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 diff --git a/MP.Prog/Resources/manifest-original.xml b/MP.Prog/Resources/manifest-original.xml index a9269ca9..f95e0763 100644 --- a/MP.Prog/Resources/manifest-original.xml +++ b/MP.Prog/Resources/manifest-original.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html false diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 1cce2c02..1dbca77e 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.1.2109.1612 - http://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/MP.Prog.zip - http://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/ChangeLog.html + https://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/MP.Prog.zip + https://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/ChangeLog.html false diff --git a/MP.Prog/post-build.ps1 b/MP.Prog/post-build.ps1 index 77d29a6a..bc301c2a 100644 --- a/MP.Prog/post-build.ps1 +++ b/MP.Prog/post-build.ps1 @@ -21,14 +21,11 @@ Set-Content -Path $FileVers -Value $currRelNum $manData = Get-Content $FileManIn $manData = $manData -replace "1.0.0.0", $currRelNum $manData = $manData -replace "{{DIRNAME}}", "MP-PROG" -$manData = $manData -replace "{{BRANCHNAME}}", "stable/0" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" $manData = $manData -replace "{{PACKNAME}}", "MP.Prog" Set-Content -Path $FileManOut -Value $manData # replace x ChangeLog $clogData = Get-Content $FileCLogIn $clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum -# $clogData = $clogData -replace "{{DIRNAME}}", "MP-PROG" -# $clogData = $clogData -replace "{{BRANCHNAME}}", "stable" -# $clogData = $clogData -replace "{{PACKNAME}}", "MP.Prog" Set-Content -Path $FileCLogOut -Value $clogData diff --git a/MP.Stats/Resources/manifest-original.xml b/MP.Stats/Resources/manifest-original.xml index a9269ca9..f95e0763 100644 --- a/MP.Stats/Resources/manifest-original.xml +++ b/MP.Stats/Resources/manifest-original.xml @@ -1,7 +1,7 @@ 1.0.0.0 - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip - http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + https://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html false diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 927561a1..bf837864 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,7 +1,7 @@ 1.1.2109.1617 - http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip - http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html + https://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip + https://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html false diff --git a/MP.Stats/post-build.ps1 b/MP.Stats/post-build.ps1 index 41c15e29..063f4945 100644 --- a/MP.Stats/post-build.ps1 +++ b/MP.Stats/post-build.ps1 @@ -21,14 +21,11 @@ Set-Content -Path $FileVers -Value $currRelNum $manData = Get-Content $FileManIn $manData = $manData -replace "1.0.0.0", $currRelNum $manData = $manData -replace "{{DIRNAME}}", "MP-STATS" -$manData = $manData -replace "{{BRANCHNAME}}", "stable/0" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" $manData = $manData -replace "{{PACKNAME}}", "MP.Stats" Set-Content -Path $FileManOut -Value $manData # replace x ChangeLog $clogData = Get-Content $FileCLogIn $clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum -# $clogData = $clogData -replace "{{DIRNAME}}", "MP-STATS" -# $clogData = $clogData -replace "{{BRANCHNAME}}", "stable" -# $clogData = $clogData -replace "{{PACKNAME}}", "MP.Stats" Set-Content -Path $FileCLogOut -Value $clogData