Build script update (Azure#5869)

mhoeger · Apr 7, 2020 · 638e46d · 638e46d
1 parent c4ed033
commit 638e46d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -248,8 +248,20 @@ function CreateZips([string] $runtimeSuffix) {
 }
 
 function deleteDuplicateWorkers() {
-    Write-Host "Deleting workers directory: $privateSiteExtensionPath\32bit\workers" 
-    Remove-Item -Recurse -Force "$privateSiteExtensionPath\32bit\workers" -ErrorAction SilentlyContinue
+    if(Test-Path "$privateSiteExtensionPath\64bit\workers") {
+        Write-Host "Moving workers directory:$privateSiteExtensionPath\64bit\workers to" $privateSiteExtensionPath 
+        Move-Item -Path "$privateSiteExtensionPath\64bit\workers"  -Destination "$privateSiteExtensionPath\workers" 
+
+        Write-Host "Silently removing $privateSiteExtensionPath\32bit\workers if exists"
+        Remove-Item -Recurse -Force "$privateSiteExtensionPath\32bit\workers" -ErrorAction SilentlyContinue
+    }
+    elseif(Test-Path "$privateSiteExtensionPath\32bit\workers") {
+        Write-Host "Moving workers directory:$privateSiteExtensionPath\32bit\workers to" $privateSiteExtensionPath 
+        Move-Item -Path "$privateSiteExtensionPath\32bit\workers"  -Destination "$privateSiteExtensionPath\workers" 
+
+        Write-Host "Silently removing $privateSiteExtensionPath\64bit\workers if exists"
+        Remove-Item -Recurse -Force "$privateSiteExtensionPath\64bit\workers" -ErrorAction SilentlyContinue
+    }
 }
 
 function cleanExtension([string] $bitness) {

diff --git a/build/initialize-pipeline.ps1 b/build/initialize-pipeline.ps1
@@ -4,9 +4,11 @@ $bypassPackaging = $true
 $includeSuffix = $true
 Write-Host "SourceBranch: $sourceBranch, Build reason: $buildReason"
 
-if($sourceBranch.endsWith('master') -and ($buildReason -ne "PullRequest"))
+if(($sourceBranch.endsWith('master') -or $sourceBranch.endsWith('dev')) -and ($buildReason -ne "PullRequest"))
 {
-  $includeSuffix = $false
+  if($sourceBranch.endsWith('master')) {
+    $includeSuffix = $false
+  }
   $bypassPackaging = $false
 }
 elseif($buildReason -eq "PullRequest")