diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6443b1d..f450433 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,15 @@ variables: $env:NUM_REL = $env:VERS_MAIN+(get-date -format yyMM)+"."+(get-date -format dHH) $env:NUM_DEB = $env:VERS_MAIN+(get-date -format yyMM)+"-beta."+(get-date -format dHH) $env:NEW_COPYRIGHT = "EgalWare @ 2021-" + (get-date -format yyyy) + # fix messaggio log in manifest... + # preparo file e contenuto da log messages + $FileCLogIn="..\Resources\ChangeLog-original.html" + $FileCLogOut="..\Resources\ChangeLog.html" + $LastMessages = git log -3 --pretty=%B + # replace x ChangeLog + $clogData = Get-Content $FileCLogIn + $clogData = $clogData -replace "{{LAST-CHANGES}}", $LastMessages + Set-Content -Path $FileCLogOut -Value $clogData # display versioni generate $resoconto = "Effettuato fix file VersGen | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB; Write-Output $resoconto; diff --git a/Maat.Runner/post-build.ps1 b/Maat.Runner/post-build.ps1 index f7be68e..5203974 100644 --- a/Maat.Runner/post-build.ps1 +++ b/Maat.Runner/post-build.ps1 @@ -23,7 +23,7 @@ Set-Content -Path $FileVers -Value $currRelNum $manData = Get-Content $FileManIn $manData = $manData -replace "1.0.0.0", $currRelNum $manData = $manData -replace "{{DIRNAME}}", "Maat.Installer" -$manData = $manData -replace "{{BRANCHNAME}}", "LAST" +$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST" $manData = $manData -replace "{{PACKNAME}}", "Maat.Installer" Set-Content -Path $FileManOut -Value $manData