From 07d23ba36078c8be481b81eaa80a4e18ef184d78 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 1 Dec 2021 11:47:38 +0100
Subject: [PATCH] test fix upload nexus

---
 .gitlab-ci.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab37f915..221b1a70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
  DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds'
  NEXUS_PATH: 'MAPO/IOB-WIN-NEXT'
  APP_NAME: 'IOB-WIN-NEXT'
- VERS_MAIN: '3.5'
+ VERS_MAIN: '3.6'
  NEW_REL: ''
  OUTPUT_DIR: ''
 
@@ -71,13 +71,13 @@ variables:
       # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
       # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".md5" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".md5"
       # mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File2Send".sha1" https://nexus.steamware.net/repository/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip".sha1"
+      # $currentDate = get-date -format yyMM;
+      # $currentTime = get-date -format ddHH;
+      # $fileVers = $env:APP_NAME + "\Resources\VersNum.txt"
 .nexusUpload: &nexusUpload
    - |
       Set-Alias mCurl  C:\Windows\system32\curl.exe
-      $currentDate = get-date -format yyMM;
-      $currentTime = get-date -format ddHH;
-      $fileVers = $env:APP_NAME + "\Resources\VersNum.txt"
-      $VersNumb = Get-Content $fileVers
+      $VersNumb = $env:NEW_REL
       echo "Curr Version: $VersNumb"     
       if($CI_COMMIT_BRANCH -eq "master")
       {
@@ -93,9 +93,11 @@ variables:
         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 "Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
-      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
+      mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip" https://nexus.steamware.net/repository/utility/MAPO/$env:APP_NAME/$version/$env:APP_NAME.zip
   
+# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
+# mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "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
 
 stages: