Skip to content

Commit c64645f

Browse files
[ci] remove $(MicroBuildSignType) variable (#10521)
This will supposedly resolve our signing issues, so I removed this value and copied the condition in each location.
1 parent 69c035c commit c64645f

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

build-tools/automation/azure-pipelines.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,9 @@ variables:
4747
- ${{ if ne(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}:
4848
- name: DotNetFeedCredential
4949
value: dnceng-dotnet9
50-
- name: MicroBuildSignType
51-
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
52-
value: Real
53-
${{ else }}:
54-
value: Test
5550

5651
extends:
57-
${{ if eq(variables['MicroBuildSignType'], 'Real') }}:
52+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
5853
template: azure-pipelines/MicroBuild.1ES.Official.yml@1esPipelines
5954
${{ else }}:
6055
template: azure-pipelines/MicroBuild.1ES.Unofficial.yml@1esPipelines
@@ -257,7 +252,10 @@ extends:
257252
name: sign_net_mac_win
258253
poolName: $(VSEngMicroBuildPool)
259254
artifactName: $(NuGetArtifactName)
260-
signType: $(MicroBuildSignType)
255+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
256+
signType: Real
257+
${{ else }}:
258+
signType: Test
261259
signedArtifactName: nuget-signed
262260
usePipelineArtifactTasks: true
263261
uploadPrefix: sign-mac-win
@@ -271,7 +269,10 @@ extends:
271269
displayName: Sign Linux Archive
272270
poolName: $(VSEngMicroBuildPool)
273271
artifactName: $(LinuxNuGetArtifactName)
274-
signType: $(MicroBuildSignType)
272+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
273+
signType: Real
274+
${{ else }}:
275+
signType: Test
275276
signedArtifactName: nuget-linux-signed
276277
usePipelineArtifactTasks: true
277278
uploadPrefix: sign-linux
@@ -287,7 +288,10 @@ extends:
287288
artifactPatterns: |
288289
!*Darwin*
289290
propsArtifactName: $(NuGetArtifactName)
290-
signType: $(MicroBuildSignType)
291+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
292+
signType: Real
293+
${{ else }}:
294+
signType: Test
291295
preConvertSteps:
292296
- task: DownloadPipelineArtifact@2
293297
inputs:

build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ steps:
5151

5252
- task: DotNetCoreCLI@2
5353
displayName: macOS signing - add runtime entitlements
54-
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
54+
condition: and(succeeded(), and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')))
5555
inputs:
5656
projects: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
5757
arguments: >-

build-tools/automation/yaml-templates/install-microbuild-tooling.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
signType: $(MicroBuildSignType)
32
condition: succeeded()
43

54
steps:
@@ -23,7 +22,10 @@ steps:
2322
displayName: install signing plugin
2423
condition: ${{ parameters.condition }}
2524
inputs:
26-
signType: ${{ parameters.signType }}
25+
${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.DefinitionName'], 'Xamarin.Android')) }}:
26+
signType: Real
27+
${{ else }}:
28+
signType: Test
2729
azureSubscription: MicroBuild Signing Task (DevDiv)
2830
env:
2931
SYSTEM_ACCESSTOKEN: $(System.AccessToken)

0 commit comments

Comments
 (0)