Skip to content

Commit 70eff89

Browse files
authored
updating build number in CI (#9896)
1 parent 786a829 commit 70eff89

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
name: Initialize
4545
inputs:
4646
filePath: '$(Build.Repository.LocalPath)\build\initialize-pipeline.ps1'
47+
arguments: -minorVersionPrefix "$(minorVersionPrefix)"
4748
showWarnings: true
4849

4950
- job: BuildArtifacts

build/build-extensions.ps1

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,20 +243,26 @@ function CreateSiteExtensions() {
243243
if ($minorVersionPrefix -eq "") {
244244
ZipContent $siteExtensionPath "$zipOutput\Functions.$extensionVersion$runtimeSuffix.zip"
245245
} elseif ($minorVersionPrefix -eq "8") {
246+
Write-Host "======================================"
246247
# Only the "Functions" site extension supports hard links
247-
Write-Host "Removing $hashesForHardLinksPath before zipping."
248+
Write-Host "MinorVersionPrefix is '8'. Removing $hashesForHardLinksPath before zipping."
248249
Remove-Item -Force "$hashesForHardLinksPath" -ErrorAction Stop
249250
# The .NET 8 host doesn't require any workers. Doing this to save space.
250251
Write-Host "Removing workers before zipping."
251-
Remove-Item -Recurse -Force "$siteExtensionPath\$extensionVersion$runtimeSuffix\workers" -ErrorAction Stop
252-
# The host requires that this folder exists, even if it's empty
253-
New-Item -Itemtype directory -path $siteExtensionPath\$extensionVersion$runtimeSuffix\workers > $null
252+
# The host requires that this folder exists and it cannot be empty
253+
Remove-Item -Recurse -Force "$siteExtensionPath\$extensionVersion$runtimeSuffix\workers" -ErrorAction Stop
254+
New-Item -Path "$siteExtensionPath\$extensionVersion$runtimeSuffix" -Name "workers" -ItemType Directory -ErrorAction Stop | Out-Null
255+
Set-Content -Force -Path "$siteExtensionPath\$extensionVersion$runtimeSuffix\workers\this_folder_intentionally_empty.txt" -Value ".NET 8 builds do not have workers. However, this folder must contain at least one file." -ErrorAction Stop
256+
Write-Host "======================================"
254257
Write-Host
255258
ZipContent $siteExtensionPath "$zipOutput\FunctionsInProc8.$extensionVersion$runtimeSuffix.zip"
256259
} elseif ($minorVersionPrefix -eq "6") {
257260
# Only the "Functions" site extension supports hard links
258-
Write-Host "Removing $hashesForHardLinksPath before zipping."
261+
Write-Host "======================================"
262+
Write-Host "MinorVersionPrefix is '6'. Removing $hashesForHardLinksPath before zipping."
259263
Remove-Item -Force "$hashesForHardLinksPath" -ErrorAction Stop
264+
Write-Host "======================================"
265+
Write-Host
260266
ZipContent $siteExtensionPath "$zipOutput\FunctionsInProc.$extensionVersion$runtimeSuffix.zip"
261267
}
262268

@@ -309,7 +315,7 @@ Write-Host
309315
Write-Host "Output directory: $buildOutput"
310316
if (Test-Path $buildOutput) {
311317
Write-Host " Existing build output found. Deleting."
312-
Remove-Item $buildOutput -Recurse -Force
318+
Remove-Item $buildOutput -Recurse -Force -ErrorAction Stop
313319
}
314320
Write-Host "Extensions version: $extensionVersion"
315321
Write-Host ""

build/initialize-pipeline.ps1

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
param (
2+
[ValidateSet("6", "8", "")][string]$minorVersionPrefix = ""
3+
)
4+
15
$buildReason = $env:BUILD_REASON
26
$sourceBranch = $env:BUILD_SOURCEBRANCH
37

@@ -23,14 +27,21 @@ if ($buildReason -eq "PullRequest") {
2327

2428
$buildNumber = ""
2529

26-
if(($buildReason -eq "PullRequest") -or !($sourceBranch.ToLower().Contains("release/4.")))
30+
$branch = $sourceBranch.ToLower();
31+
$isRelease = $branch.Contains("release/4") -or $branch.Contains("release/inproc6/4") -or $branch.Contains("release/inproc8/4")
32+
33+
if(($buildReason -eq "PullRequest") -or !$isRelease)
2734
{
2835
$buildNumber = $env:buildNumber
2936
Write-Host "BuildNumber: '$buildNumber'"
3037
}
38+
else
39+
{
40+
Write-Host "Release build; Not using a build number."
41+
}
3142

3243
Import-Module $PSScriptRoot\Get-AzureFunctionsVersion -Force
33-
$version = Get-AzureFunctionsVersion $buildNumber $buildNumber
44+
$version = Get-AzureFunctionsVersion $buildNumber $buildNumber $minorVersionPrefix
3445

3546
Write-Host "Site extension version: $version"
3647
Write-Host "##vso[build.updatebuildnumber]$version"

0 commit comments

Comments
 (0)