Skip to content

Fix issue with unsigned build #14367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 5 commits into from
Dec 9, 2020
Merged

Fix issue with unsigned build #14367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e5adc0
fix issue with manually building master
TravisEz13 Dec 9, 2020
27b2102
only scan when signed
TravisEz13 Dec 9, 2020
3f5acf4
pass through shouldsign
TravisEz13 Dec 9, 2020
0397a73
REVERT ME: switch to should sign branch
TravisEz13 Dec 9, 2020
5763114
Revert "REVERT ME: switch to should sign branch"
TravisEz13 Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ jobs:
pattern: |
**\*.rpm
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

# requires windows
- task: AzureFileCopy@4
Expand Down
12 changes: 7 additions & 5 deletions tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ jobs:
pattern: |
**\*.zip
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

- pwsh: |
$destination = "$(System.ArtifactsDirectory)\azureMacOs"
Expand All @@ -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'
Expand Down
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
pattern: |
**\*.zip
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

- template: upload-final-results.yml
parameters:
Expand Down
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\' }
Expand Down
1 change: 1 addition & 0 deletions tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
**\*.msi
**\*.msix
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

- powershell: |
new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
Expand Down
2 changes: 2 additions & 0 deletions tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ jobs:
**\*.ps1
**\*.exe
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

- pwsh: |
Import-Module $(PowerShellRoot)/build.psm1 -Force
Expand Down Expand Up @@ -188,6 +189,7 @@ jobs:
pattern: |
**\*.dll
useMinimatch: true
shouldSign: $(SHOULD_SIGN)

- powershell: |
Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseBuild/setReleaseTag.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down