Fix issue with unsigned build (#14367)

This commit is contained in:
Travis Plunk
2020-12-09 14:51:43 -08:00
committed by GitHub
parent 3905cb0beb
commit f6fa262580
7 changed files with 14 additions and 6 deletions
@@ -120,6 +120,7 @@ jobs:
pattern: |
**\*.rpm
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
# requires windows
- task: AzureFileCopy@4
@@ -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'
@@ -60,6 +60,7 @@ jobs:
pattern: |
**\*.zip
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
- template: upload-final-results.yml
parameters:
@@ -141,6 +141,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\' }
@@ -49,6 +49,7 @@ jobs:
**\*.msi
**\*.msix
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
- powershell: |
new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
@@ -158,6 +158,7 @@ jobs:
**\*.ps1
**\*.exe
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
- pwsh: |
Import-Module $(PowerShellRoot)/build.psm1 -Force
@@ -193,6 +194,7 @@ jobs:
pattern: |
**\*.dll
useMinimatch: true
shouldSign: $(SHOULD_SIGN)
- powershell: |
Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
+1 -1
View File
@@ -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