Fix issue with unsigned build (#14367)

TravisEz13 · TravisEz13 · commit 02aa91ea1cdf · 2020-12-16T12:05:57.000-08:00
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -120,6 +120,7 @@ jobs:
           pattern: |
             **\*.rpm
           useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
 
   # requires windows
   - task: AzureFileCopy@4
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -73,6 +73,7 @@ jobs:
           pattern: |
             **\*.zip
           useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
 
     - pwsh: |
         $destination = "$(System.ArtifactsDirectory)\azureMacOs"
@@ -89,11 +90,12 @@ jobs:
         artifactName: signedMacOsBins
         condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
-    - template: EsrpScan.yml@ComplianceRepo
-      parameters:
-          scanPath: $(System.ArtifactsDirectory)\azureMacOs
-          pattern: |
-            **\*
+    - ${{ if eq(variables['SHOULD_SIGN'], 'true') }}:
+      - template: EsrpScan.yml@ComplianceRepo
+        parameters:
+            scanPath: $(System.ArtifactsDirectory)\azureMacOs
+            pattern: |
+              **\*
 
     - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
       displayName: 'Component Detection'
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -60,6 +60,7 @@ jobs:
         pattern: |
           **\*.zip
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - template: upload-final-results.yml
     parameters:
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -148,6 +148,7 @@ jobs:
         pattern: |
           **\*.nupkg
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - pwsh: |
       if (-not (Test-Path '$(System.ArtifactsDirectory)\signed\')) { $null = New-Item -ItemType Directory -Path '$(System.ArtifactsDirectory)\signed\' }
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -49,6 +49,7 @@ jobs:
           **\*.msi
           **\*.msix
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - powershell: |
       new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -153,6 +153,7 @@ jobs:
           **\*.ps1
           **\*.exe
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
@@ -188,6 +189,7 @@ jobs:
         pattern: |
           **\*.dll
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - powershell: |
       Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
@@ -79,7 +79,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
             New-BuildInfoJson -ReleaseTag $releaseTag
         }
     }
-    elseif($branchOnly -eq 'master' -or $branchOnly -like '*dailytest*')
+    elseif(($branchOnly -eq 'master' -and $env:BUILD_REASON -ne 'Manual')  -or $branchOnly -like '*dailytest*')
     {
         $isDaily = $true
         Write-Verbose "daily build" -Verbose

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)`
`79`	`79`	`New-BuildInfoJson -ReleaseTag $releaseTag`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`- elseif($branchOnly -eq 'master' -or $branchOnly -like 'dailytest')`
	`82`	`+ elseif(($branchOnly -eq 'master' -and $env:BUILD_REASON -ne 'Manual') -or $branchOnly -like 'dailytest')`
`83`	`83`	`{`
`84`	`84`	`$isDaily = $true`
`85`	`85`	`Write-Verbose "daily build" -Verbose`