Skip to content

Fix conditions for ESRP templates #7

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
merged 8 commits into from
Oct 29, 2020
Merged

Fix conditions for ESRP templates #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83eb70b
Fix conditions for esrp templates
adityapatwardhan Oct 27, 2020
4919b6f
Log parameters and pass parameters to nuget template
adityapatwardhan Oct 29, 2020
95eaf7b
Simplify condition
adityapatwardhan Oct 29, 2020
c1579ac
Further simplify condition
adityapatwardhan Oct 29, 2020
0232d22
Remove unnecessary expression decoration
adityapatwardhan Oct 29, 2020
e26b303
Remove NuGet verify
adityapatwardhan Oct 29, 2020
08614d8
Add condition for third party cert
adityapatwardhan Oct 29, 2020
b6d4b94
Split authenticode condition into two
adityapatwardhan Oct 29, 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
40 changes: 30 additions & 10 deletions EsrpSign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,36 @@ steps:
inputs:
version: 2.x

- template: template-compliance/authenticode-sign.yml
parameters:
buildOutputPath: ${{ parameters.buildOutputPath }}
signOutputPath: ${{ parameters.signOutputPath }}
pattern: ${{ parameters.pattern }}
certificateId: ${{ parameters.certificateId }}
condition: or(eq('${{ parameters.certificateId }}', 'CP-230012'), eq('${{ parameters.certificateId }}', 'CP-231522'))

- template: template-compliance/nuget-sign.yml
condition: eq('${{ parameters.certificateId }}', 'CP-401405')
- pwsh: |
Write-Verbose -Verbose "buildOutputPath = '${{ parameters.buildOutputPath }}'"
Write-Verbose -Verbose "signOutputPath = '${{ parameters.signOutputPath }}'"
Write-Verbose -Verbose "certificateId = '${{ parameters.certificateId }}'"
Write-Verbose -Verbose "pattern = '${{ parameters.pattern }}'"
displayName: Log parameters

- ${{ if eq(parameters.certificateId , 'CP-230012') }}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This cert should also use authenticode 'CP-231522'

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

having them in a since if did not work for some reason.

- template: template-compliance/authenticode-sign.yml
parameters:
buildOutputPath: ${{ parameters.buildOutputPath }}
signOutputPath: ${{ parameters.signOutputPath }}
pattern: ${{ parameters.pattern }}
certificateId: ${{ parameters.certificateId }}

- ${{ if eq(parameters.certificateId , 'CP-231522') }}:
- template: template-compliance/authenticode-sign.yml
parameters:
buildOutputPath: ${{ parameters.buildOutputPath }}
signOutputPath: ${{ parameters.signOutputPath }}
pattern: ${{ parameters.pattern }}
certificateId: ${{ parameters.certificateId }}

- ${{ if eq(parameters.certificateId, 'CP-401405') }}:
- template: template-compliance/nuget-sign.yml
parameters:
buildOutputPath: ${{ parameters.buildOutputPath }}
signOutputPath: ${{ parameters.signOutputPath }}
pattern: ${{ parameters.pattern }}
certificateId: ${{ parameters.certificateId }}

- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
displayName: Sign files
Expand Down
6 changes: 0 additions & 6 deletions template-compliance/nuget-sign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ steps:
operationSetCode = "NuGetSign"
toolName = "sign"
toolVersion = "1.0"
},
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could not get nuget verify to work, i will solve this later

@{
keyCode = $CertificateId
operationSetCode = "NuGetVerify"
toolName = "sign"
toolVersion = "1.0"
}
)

Expand Down