From ceb448bd4ea8db7acf3c4031194711d6bae003c3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 11:44:57 +0100 Subject: [PATCH 1/2] fix path x NKC_WF? --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1ec28a..cbc9bdb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,16 +29,16 @@ variables: echo "Set vers: $env:NEW_REL" $contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw $newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL - $newContenuto | Set-Content -Path 'VersGen\VersGen.cs' + $newContenuto | Set-Content -path 'VersGen\VersGen.cs' # helper x fix manifest xml .manifest-fix: &manifest-fix - | echo "Set manifest.xml for branch: $CI_COMMIT_BRANCH" - $contenuto = Get-Content -path '$env:PROJ_NAME\Resources\manifest.xml' -Raw + $contenuto = Get-Content -path $env:PROJ_NAME'\Resources\manifest.xml' -Raw $newContenuto = $contenuto -replace '{{BRANCHNAME}}', $CI_COMMIT_BRANCH $newContenuto = $newContenuto -replace '0.0.0.0', $env:NEW_REL - $newContenuto | Set-Content -Path '$env:PROJ_NAME\Resources\manifest.xml' + $newContenuto | Set-Content -path $env:PROJ_NAME'\Resources\manifest.xml' # helper creazione hash files .hashBuild: &hashBuild @@ -48,8 +48,8 @@ variables: $SHA1 = Get-FileHash $Target -Algorithm SHA1 New-Item $Target".md5" New-Item $Target".sha1" - $MD5.Hash | Set-Content -Path $Target".md5" - $SHA1.Hash | Set-Content -Path $Target".sha1" + $MD5.Hash | Set-Content -path $Target".md5" + $SHA1.Hash | Set-Content -path $Target".sha1" echo "Created HASH files for $Target" @@ -72,7 +72,7 @@ variables: } $File2Send = Get-ChildItem($env:PROJ_NAME + "\Release\*") ForEach ($File in $File2Send) { - $FileName = Split-Path $File -leaf + $FileName = Split-path $File -leaf mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/LAST/$FileName mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$CI_COMMIT_BRANCH/ARCHIVE/$VersNumb/$FileName } From 26335a70e788bc243f22339a883d6a732e27dd47 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 25 Nov 2021 11:49:51 +0100 Subject: [PATCH 2/2] fix versioni CORE --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbc9bdb..d79a381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -195,6 +195,8 @@ Core:install: before_script: # - *nuget-fix - dotnet restore REMAN.sln + - *version-fix + - *manifest-fix script: - dotnet publish -p:PublishProfile=IISProfile.pubxml -p:RunCodeAnalysis=false -p:Configuration=Release REMAN/REMAN.csproj -o:publish # qui il deploy su nexus...