Merge pull request #1978 from RaiKoHoff/RC1

Unique AppVeyor builds using internal build numbers for version info
This commit is contained in:
Rainer Kottenhoff 2020-02-12 12:05:29 +01:00 committed by GitHub
commit 1379409c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -38,9 +38,9 @@ try
$Revis = [int]$(Get-Date -format MMdd)
$Build = [int](Get-Content "Versions\build.txt")
if (!$Build) { $Build = 0 }
$AppveyorBuild = [int]($env:appveyor_build_number) # Appveyor internal
if ($AppVeyorEnv) {
#~ $Build = [int]($env:appveyor_build_number)
$CommitID = ([string]($env:appveyor_repo_commit)).substring(0,8)
}
else {
@ -63,9 +63,11 @@ try
if (!$CommitID) { $CommitID = "---" }
$CompleteVer = "$Major.$Minor.$Revis.$Build"
DebugOutput("Version number: 'v$CompleteVer $VerPatch'")
DebugOutput("Notepad3 version number: 'v$CompleteVer $VerPatch'")
if ($AppVeyorEnv) {
Update-AppveyorBuild -Version $CompleteVer
$AppveyorVer = "$Major.$Minor.$Revis.$AppveyorBuild"
DebugOutput("Appveyor version number: 'v$AppveyorVer $VerPatch'")
Update-AppveyorBuild -Version $AppveyorVer
}
$SciVer = [string](Get-Content "scintilla\version.txt")