Skip to content

Unify on one version of the ESRP tasks #92451

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
jkoritzinsky merged 2 commits into from
Sep 22, 2023
Merged

Unify on one version of the ESRP tasks #92451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
890b8b4
Change the macos signing steps to use the same sigining tool version …
jkoritzinsky Sep 21, 2023
cdbd546
Upgrade code signing task version
jkoritzinsky Sep 21, 2023
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
18 changes: 14 additions & 4 deletions eng/pipelines/common/macos-sign-with-entitlements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
parameters:
filesToSign: []
timeoutInMinutes: '30'

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 2.1.808'
displayName: Install .NET 6 SDK for signing.
inputs:
packageType: sdk
version: 2.1.808
packageType: 'sdk'
version: '6.0.x'
installationPath: '$(Agent.TempDirectory)/dotnet'

- ${{ each file in parameters.filesToSign }}:
- script: codesign -s - -f --entitlements ${{ file.entitlementsFile }} ${{ file.path }}/${{ file.name }}
Expand All @@ -28,7 +30,7 @@ steps:
includeRootFolder: true
replaceExistingArchive: true

- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
- task: EsrpCodeSigning@4
displayName: 'ESRP CodeSigning'
inputs:
ConnectedServiceName: 'ESRP CodeSigning'
Expand All @@ -48,6 +50,14 @@ steps:
"toolVersion": "1.0"
}
]
SessionTimeout: ${{ parameters.timeoutInMinutes }}
MaxConcurrency: '50'
MaxRetryAttempts: '5'
PendingAnalysisWaitTimeoutMinutes: '5'
env:
DOTNET_MULTILEVEL_LOOKUP: 0
DOTNET_ROOT: '$(Agent.TempDirectory)/dotnet'
DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR: '$(Agent.TempDirectory)/dotnet'

- task: ExtractFiles@1
displayName: 'Extract MacOS after signing'
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
version: '6.0.x'
installationPath: '$(Agent.TempDirectory)/dotnet'

- task: EsrpCodeSigning@1
- task: EsrpCodeSigning@4
displayName: Sign Diagnostic Binaries
inputs:
ConnectedServiceName: 'dotnetesrp-diagnostics-dnceng'
Expand Down Expand Up @@ -48,6 +48,7 @@ steps:
SessionTimeout: ${{ parameters.timeoutInMinutes }}
MaxConcurrency: '50'
MaxRetryAttempts: '5'
PendingAnalysisWaitTimeoutMinutes: '5'
Copy link
Member

@hoyosjs hoyosjs Sep 22, 2023

Choose a reason for hiding this comment

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

I guess we can tune this out for network hiccups.

Copy link
Member Author

@jkoritzinsky jkoritzinsky Sep 22, 2023

Choose a reason for hiding this comment

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

Yeah I just grabbed the default of what using the AzDO UI fills in for this parameter.

env:
DOTNET_MULTILEVEL_LOOKUP: 0
DOTNET_ROOT: '$(Agent.TempDirectory)/dotnet'
Expand Down