Skip to content

Commit c809396

Browse files
authored
Validate Signing on Mac + Linux (#46652)
1 parent 5c5a92b commit c809396

File tree

2 files changed

+55
-11
lines changed

2 files changed

+55
-11
lines changed

eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,11 +949,35 @@ stages:
949949
displayName: VMR Validation
950950
dependsOn: VMR_Final_Join
951951
jobs:
952-
- job: ValidateSigning
953-
displayName: Validate Signing
952+
- job: ValidateSigning_Windows
953+
displayName: Validate Signing - Windows
954954
pool: ${{ parameters.pool_Windows }}
955955
timeoutInMinutes: 240
956956
steps:
957957
- template: ../steps/vmr-validate-signing.yml
958958
parameters:
959+
artifactName: PackageArtifacts
959960
continueOnError: true
961+
OS: Windows_NT
962+
963+
- job: ValidateSigning_Mac
964+
displayName: Validate Signing - Mac
965+
pool: ${{ parameters.pool_Mac }}
966+
timeoutInMinutes: 240
967+
steps:
968+
- template: ../steps/vmr-validate-signing.yml
969+
parameters:
970+
artifactName: BlobArtifacts
971+
continueOnError: true
972+
OS: Darwin
973+
974+
- job: ValidateSigning_Linux
975+
displayName: Validate Signing - Linux
976+
pool: ${{ parameters.pool_Linux }}
977+
timeoutInMinutes: 240
978+
steps:
979+
- template: ../steps/vmr-validate-signing.yml
980+
parameters:
981+
artifactName: BlobArtifacts
982+
continueOnError: true
983+
OS: Linux
Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,46 @@
11
parameters:
2+
- name: artifactName
3+
type: string
4+
25
- name: continueOnError
36
type: boolean
47
default: false
58

9+
- name: OS
10+
type: string
11+
values:
12+
- Windows_NT
13+
- Linux
14+
- Darwin
15+
616
steps:
717
- task: DownloadBuildArtifacts@1
818
inputs:
9-
artifactName: 'PackageArtifacts'
19+
artifactName: ${{ parameters.artifactName }}
1020
downloadPath: $(Build.ArtifactStagingDirectory)
1121
checkDownloadedFiles: true
12-
displayName: Download Package Artifacts
22+
displayName: Download Artifacts
1323

1424
# This is necessary whenever we want to publish/restore to an AzDO private feed
1525
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
1626
# otherwise it'll complain about accessing a private feed.
1727
- task: NuGetAuthenticate@1
1828
displayName: 'Authenticate to AzDO Feeds'
1929

20-
- task: PowerShell@2
21-
inputs:
22-
filePath: eng\common\sdk-task.ps1
23-
arguments: -task SigningValidation -restore -msbuildEngine vs
24-
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
25-
displayName: Validate Signing of Packages
26-
continueOnError: ${{ parameters.continueOnError }}
30+
- ${{ if eq(parameters.OS, 'Windows_NT') }}:
31+
- task: PowerShell@2
32+
inputs:
33+
filePath: eng\common\sdk-task.ps1
34+
arguments: -task SigningValidation -restore -msbuildEngine vs
35+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/${{ parameters.artifactName }}'
36+
displayName: Validate Signing of Packages
37+
continueOnError: ${{ parameters.continueOnError }}
38+
39+
- ${{ else }}:
40+
- task: Bash@3
41+
inputs:
42+
filePath: eng/common/sdk-task.sh
43+
arguments: --task SigningValidation --restore
44+
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/${{ parameters.artifactName }}'
45+
displayName: Validate - ${{ parameters.OS }}
46+
continueOnError: ${{ parameters.continueOnError }}

0 commit comments

Comments
 (0)