Skip to content

Commit

Permalink
Update the signing template (#2932) (#2946)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattleibow authored Jul 17, 2024
1 parent a805bc2 commit a1f734d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
5 changes: 5 additions & 0 deletions scripts/SignList.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,9 @@
<!-- <Skip Include="System.*.dll" /> -->
</ItemGroup>

<ItemGroup>
<MacDeveloperSign Include="libSkiaSharp.dylib" />
<MacDeveloperSign Include="libHarfBuzzSharp.dylib" />
</ItemGroup>

</Project>
7 changes: 6 additions & 1 deletion scripts/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ parameters:
displayName: 'Run post-build compliance tasks (such as API Scan and PoliCheck)'
type: boolean
default: false
- name: forceRealSigning
displayName: 'Ignore all logic and force Real signing on binaries'
type: boolean
default: false

variables:
- template: /scripts/azure-pipelines-variables.yml@self
Expand Down Expand Up @@ -78,6 +82,7 @@ extends:
buildExternals: ${{ parameters.buildExternals }}
${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(variables['System.PullRequest.IsFork'], 'true')) }}:
enableSigning: true
forceRealSigning: ${{ parameters.forceRealSigning }}
${{ if or(parameters.runCompliance, and(eq(variables['Build.Reason'], 'Schedule'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))) }}:
sdl:
apiscan:
Expand Down Expand Up @@ -107,4 +112,4 @@ extends:
buildAgentMac: ${{ parameters.buildAgentMac }}
buildAgentMacNative: ${{ parameters.buildAgentMac }}
buildAgentLinux: ${{ parameters.buildAgentLinux }}
buildAgentLinuxNative: ${{ parameters.buildAgentLinux }}
buildAgentLinuxNative: ${{ parameters.buildAgentLinux }}
9 changes: 6 additions & 3 deletions scripts/azure-templates-stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ parameters:
- name: enableSigning
type: boolean
default: false
- name: forceRealSigning
type: boolean
default: false

stages:
- stage: prepare
Expand Down Expand Up @@ -661,11 +664,11 @@ stages:
displayName: Sign NuGets
dependsOn: package
jobs:
- template: sign-artifacts/jobs/v2.yml@xamarin-templates
- template: sign-artifacts/jobs/v3.yml@xamarin-templates
parameters:
${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
${{ if or(eq(parameters.forceRealSigning, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}:
signType: 'Real'
${{ if not(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}:
${{ else }}:
signType: 'Test'
use1ESTemplate: ${{ parameters.use1ESPipelineTemplates }}
usePipelineArtifactTasks: true
Expand Down

0 comments on commit a1f734d

Please sign in to comment.