Skip to content

Commit 3017502

Browse files
authored
Some post build signing fixups (#28476)
Some error checking in arcade was tightened up a bit, leading to failures in the push to bar and publishing steps for aspnet. The two errors were: - Conflicting certificate entries for the .msi extension, because the PostBuildSign variable wasn't being passed to the rpm/deb docker builds. Fixed by making it a build parameter. - Duplicated items to publish entries in the same leg. This is just because the deb/rpm and archive/package build steps share output directories. So artifacts produced in the first get picked up in the last leg. Instead, only do publishing in the last build step once everything is built.
1 parent 606141f commit 3017502

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.azure/pipelines/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ variables:
6161
value: /p:TeamName=$(_TeamName)
6262
/p:OfficialBuildId=$(Build.BuildNumber)
6363
/p:SkipTestBuild=true
64+
/p:PostBuildSign=$(PostBuildSign)
6465
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
6566
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
6667
- group: DotNet-Blob-Feed
@@ -89,7 +90,7 @@ variables:
8990
value: -ExcludeCIBinaryLog
9091
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
9192
- name: _BuildArgs
92-
value: '/p:SkipTestBuild=true'
93+
value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
9394
- name: _PublishArgs
9495
value: ''
9596
# Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
@@ -431,7 +432,6 @@ stages:
431432
-p:OnlyPackPlatformSpecificPackages=true
432433
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
433434
$(_BuildArgs)
434-
$(_PublishArgs)
435435
$(_InternalRuntimeDownloadArgs)
436436
displayName: Run build.sh
437437
- script: |
@@ -461,7 +461,7 @@ stages:
461461
-p:OnlyPackPlatformSpecificPackages=true \
462462
-p:BuildRuntimeArchive=false \
463463
-p:LinuxInstallerType=rpm \
464-
-p:AssetManifestFileName=aspnetcore-Linux_x64-installers.xml \
464+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml \
465465
$(_BuildArgs) \
466466
$(_PublishArgs) \
467467
$(_InternalRuntimeDownloadArgs)

eng/Publishing.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@
5454
Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
5555
the nupkgs pushed. -->
5656
<ItemsToPushToBlobFeed Remove="@(ItemsToPushToBlobFeed)" Condition="'$(OS)' != 'Windows_NT' and '$(PostBuildSign)' != 'true'" />
57-
<!-- Linux x64 is built in 3 stages: Build the base packages, layout, and archive. Then build deb and rpm installers.
58-
The first and last segments will both publish the layout (they share artifacts). Only publish this during the first pass. -->
59-
<_InstallersToPublish Remove="$(ArtifactsDir)installers\**\*.tar.gz" Condition="'$(BuildRuntimeArchive)' == 'false'" />
60-
<_ChecksumsToPublish Remove="$(ArtifactsDir)installers\**\*.tar.gz.sha512" Condition="'$(BuildRuntimeArchive)' == 'false'" />
6157

6258
<ItemsToPushToBlobFeed Include="@(_ChecksumsToPublish)">
6359
<PublishFlatContainer>true</PublishFlatContainer>

eng/Signing.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ItemGroup>
66
<!-- Reset Arcade's defaults. -->
77
<ItemsToSign Remove="@(ItemsToSign)" />
8+
<ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />
89
<FileExtensionSignInfo Remove="@(FileExtensionSignInfo)" />
910
</ItemGroup>
1011

0 commit comments

Comments
 (0)