From 7a66799e22cbf2ab404705ded4410114b424d710 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Wed, 20 Dec 2017 09:45:52 +0000 Subject: [PATCH] update padding rules and master build tag --- build.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.ps1 b/build.ps1 index 3cdb8f3d4..618e839f7 100644 --- a/build.ps1 +++ b/build.ps1 @@ -21,6 +21,7 @@ $isVersionTag = $env:APPVEYOR_REPO_TAG_NAME -match $tagRegex $version = "${version}-${postTag}" } if("$count" -ne ""){ + # for consistancy with previous releases we pad the counter to only 4 places $padded = $count.Trim().Trim('0').PadLeft(4,"0"); Write-Debug "count '$count', padded '${padded}'" @@ -51,8 +52,8 @@ $isVersionTag = $env:APPVEYOR_REPO_TAG_NAME -match $tagRegex } $buildNumber = $env:APPVEYOR_BUILD_NUMBER - - $buildNumber = "$buildNumber".Trim().Trim('0').PadLeft(4,"0"); + # build number replacement is padded to 6 places + $buildNumber = "$buildNumber".Trim().Trim('0').PadLeft(6,"0"); if("$env:APPVEYOR_PULL_REQUEST_NUMBER" -ne ""){ Write-Debug "building a PR" @@ -77,7 +78,7 @@ $isVersionTag = $env:APPVEYOR_REPO_TAG_NAME -match $tagRegex $branch = $branch.Replace("/","-").ToLower() if($branch.ToLower() -eq "master"){ - $branch = "ci" + $branch = "dev" } $version = "${version}-${branch}${buildNumber}";