Skip to content

Commit 554eb9e

Browse files
authored
[ci] Install signing plugin after building (#8346)
A few of the projects in our submodules are configured to sign output files after build: https://github.com/xamarin/xamarin-android-tools/blob/fa3711b7ddac7cea6850a9c1c67beda1996aafc0/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj#L36 https://github.com/xamarin/androidtools/blob/720fd4e7cc2f018c681843210edfc796c97c1dde/Xamarin.AndroidTools/Xamarin.AndroidTools.csproj#L21 We should skip these sign requests during our build as we perform post build signing for all of our shipping artifacts.
1 parent 795cc57 commit 554eb9e

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,13 @@ stages:
4545
path: ${{ parameters.checkoutPath }}
4646
persistCredentials: ${{ parameters.checkoutPersistCredentials }}
4747

48-
- template: install-microbuild-tooling.yaml
49-
parameters:
50-
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
51-
5248
- template: commercial-build.yaml
5349
parameters:
5450
installerArtifactName: ${{ parameters.installerArtifactName }}
5551
nugetArtifactName: ${{ parameters.nugetArtifactName }}
5652
provisionatorChannel: ${{ parameters.provisionatorChannel }}
5753
testAssembliesArtifactName: ${{ parameters.testAssembliesArtifactName }}
5854

59-
- template: remove-microbuild-tooling.yaml
60-
parameters:
61-
condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real'))
62-
6355
- powershell: |
6456
[IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/empty")
6557
[IO.Directory]::CreateDirectory("$(Build.StagingDirectory)/sbom-components")

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,22 @@ steps:
7777
displayName: CodeQL 3000 Finalize
7878
condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
7979

80+
- template: install-microbuild-tooling.yaml
81+
parameters:
82+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
83+
8084
# Restore needs to be executed first or MicroBuild targets won't be imported in time
8185
- task: MSBuild@1
8286
displayName: msbuild /t:Restore sign-content.proj
87+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
8388
inputs:
8489
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
8590
configuration: $(XA.Build.Configuration)
8691
msbuildArguments: /t:Restore /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
8792

8893
- task: MSBuild@1
8994
displayName: PKG signing - add entitlements and sign
95+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
9096
inputs:
9197
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
9298
configuration: $(XA.Build.Configuration)
@@ -98,6 +104,7 @@ steps:
98104
99105
- task: MSBuild@1
100106
displayName: PKG signing - sign binutils libraries
107+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
101108
inputs:
102109
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
103110
configuration: $(XA.Build.Configuration)
@@ -109,6 +116,7 @@ steps:
109116
110117
- task: MSBuild@1
111118
displayName: PKG signing - sign binutils executables
119+
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
112120
inputs:
113121
solution: ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
114122
configuration: $(XA.Build.Configuration)
@@ -118,6 +126,10 @@ steps:
118126
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
119127
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
120128
129+
- template: remove-microbuild-tooling.yaml
130+
parameters:
131+
condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real'))
132+
121133
- script: make create-installers CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}'
122134
workingDirectory: ${{ parameters.xaSourcePath }}
123135
displayName: make create-installers

0 commit comments

Comments
 (0)