Skip to content

Commit eb2736b

Browse files
github-actions[bot]rmarinho
github-actions[bot]
and
rmarinho
authored
[release/10.0.1xx-preview4] [ci] Push metadata rollbacks (#29425)
* [ci] meta to publish remove that extra Try this try version try without build Try push rollbacks and sdks [ci] Suffix with sdk/rollback * Update Microsoft.NET.Sdk.Maui.Manifest.csproj --------- Co-authored-by: Rui Marinho <[email protected]>
1 parent df34cdc commit eb2736b

File tree

3 files changed

+38
-49
lines changed

3 files changed

+38
-49
lines changed

‎eng/Publishing.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
<ItemGroup>
1515
<_InstallersToPublish Include="$(ArtifactsShippingPackagesDir)\**\*.zip" />
16+
<_MetadataRollbacksToPublish Include="$(ArtifactsShippingPackagesDir)\**\metadata\rollbacks\**\*.json" />
17+
<_MetadataSdksToPublish Include="$(ArtifactsShippingPackagesDir)\**\metadata\sdks\**\*.json" />
1618
</ItemGroup>
1719

1820
<PropertyGroup>
@@ -27,6 +29,18 @@
2729
<IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
2830
<PublishFlatContainer>true</PublishFlatContainer>
2931
</Artifact>
32+
33+
<Artifact Include="@(_MetadataRollbacksToPublish)" Kind="Blob" RelativeBlobPath="$(_UploadPathRoot)/$(VSComponentVersion)/metadata/rollback/%(Filename)%(Extension)">
34+
<IsShipping>true</IsShipping>
35+
<IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
36+
<PublishFlatContainer>false</PublishFlatContainer>
37+
</Artifact>
38+
39+
<Artifact Include="@(_MetadataSdksToPublish)" Kind="Blob" RelativeBlobPath="$(_UploadPathRoot)/$(VSComponentVersion)/metadata/sdks/%(Filename)%(Extension)">
40+
<IsShipping>true</IsShipping>
41+
<IsShipping Condition="$([System.String]::Copy('%(RecursiveDir)').StartsWith('NonShipping'))">false</IsShipping>
42+
<PublishFlatContainer>false</PublishFlatContainer>
43+
</Artifact>
3044
</ItemGroup>
3145

3246
</Target>

‎eng/pipelines/arcade/stage-pack.yml

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -50,49 +50,32 @@ stages:
5050
- checkout: self
5151
fetchDepth: 1
5252
clean: true
53-
53+
5454
steps:
5555
- ${{ each step in parameters.prepareSteps }}:
5656
- ${{ each pair in step }}:
57-
${{ pair.key }}: ${{ pair.value }}
57+
${{ pair.key }}: ${{ pair.value }}
5858

59-
- script: $(_buildScript)
60-
-restore -build
61-
-configuration $(_BuildConfig)
62-
/p:ArchiveTests=true
63-
/p:TreatWarningsAsErrors=false
64-
/p:_SkipUpdateBuildNumber=true
65-
/bl:$(Build.Arcade.LogsPath)build.binlog
66-
$(_OfficialBuildIdArgs)
67-
displayName: 🛠️ Build
59+
# - script: $(_buildScript)
60+
# -restore -build
61+
# -configuration $(_BuildConfig)
62+
# /p:ArchiveTests=true
63+
# /p:TreatWarningsAsErrors=false
64+
# /p:_SkipUpdateBuildNumber=true
65+
# /bl:$(Build.Arcade.LogsPath)build.binlog
66+
# $(_OfficialBuildIdArgs)
67+
# displayName: 🛠️ Build
6868

6969
# Run on public pipeline
7070
- ${{ if parameters.runAsPublic }}:
71-
- script: $(_buildScript)
72-
-restore -pack
73-
-publish $(_PublishArgs)
74-
-configuration $(_BuildConfig)
75-
/bl:$(Build.Arcade.LogsPath)pack.binlog
76-
$(_OfficialBuildIdArgs)
71+
- script: $(_buildScript) -restore -pack -publish $(_PublishArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)pack.binlog $(_OfficialBuildIdArgs)
7772
displayName: Pack & Publish
7873

7974
# Run on internal pipeline
8075
- ${{ if and(not(parameters.runAsPublic) , notin(variables['Build.Reason'], 'PullRequest')) }}:
81-
- script: $(_buildScript)
82-
-restore -pack
83-
-sign $(_SignArgs)
84-
-configuration $(_BuildConfig)
85-
/bl:$(Build.Arcade.LogsPath)pack.binlog
86-
$(_OfficialBuildIdArgs)
76+
- script: $(_buildScript) -restore -pack -sign $(_SignArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)pack.binlog $(_OfficialBuildIdArgs)
8777
displayName: Pack, Sign
88-
78+
8979
# only for workloads
90-
- script: $(_buildScript)
91-
-restore -build
92-
-sign $(_SignArgs)
93-
-publish $(_PublishArgs)
94-
-configuration $(_BuildConfig)
95-
/bl:$(Build.Arcade.LogsPath)/build-workloads.binlog
96-
-projects src/Workload/workloads.csproj
97-
$(_OfficialBuildIdArgs)
80+
- script: $(_buildScript) -restore -build -sign $(_SignArgs) -publish $(_PublishArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)/build-workloads.binlog -projects src/Workload/workloads.csproj $(_OfficialBuildIdArgs)
9881
displayName: Build Workloads, Sign & Publish

‎src/Workload/Microsoft.NET.Sdk.Maui.Manifest/Microsoft.NET.Sdk.Maui.Manifest.csproj

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,14 @@
116116
</Target>
117117

118118
<Target Name="_CopyAdditionalFIles" AfterTargets="Build">
119-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(Version)/$(SourceRevisionId).json" />
120-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(Version)/$(PackageVersion).$(BUILDVERSION).json" />
121-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(Version)/$(PackageVersion).json" />
122-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(Version)/$(PackageReferenceVersion).json" />
123-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(SourceRevisionId).json" />
124-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(PackageVersion).json" />
125-
<Copy Condition="$(CI) and '$(BUILD_SOURCEBRANCHNAME)' != ''" SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(BUILD_SOURCEBRANCHNAME).json" />
126-
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(PackageReferenceVersion).json" />
127-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(Version)/$(SourceRevisionId).json" />
128-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(Version)/$(PackageVersion).$(BUILDVERSION).json" />
129-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(Version)/$(PackageVersion).json" />
130-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(Version)/$(PackageReferenceVersion).json" />
131-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(SourceRevisionId).json" />
132-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(PackageVersion).json" />
133-
<Copy Condition="$(CI) and '$(BUILD_SOURCEBRANCHNAME)' != ''" SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(BUILD_SOURCEBRANCHNAME).json" />
134-
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(PackageReferenceVersion).json" />
119+
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(SourceRevisionId)_rollback.json" />
120+
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(PackageVersion)_rollback.json" />
121+
<Copy Condition="$(CI) and '$(BUILD_SOURCEBRANCHNAME)' != ''" SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(BUILD_SOURCEBRANCHNAME)_rollback.json" />
122+
<Copy SourceFiles="$(OutputPath)Rollback.json" DestinationFiles="$(PackageOutputPath)/metadata/rollbacks/$(PackageReferenceVersion)_rollback.json" />
123+
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(SourceRevisionId)_sdk.json" />
124+
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(PackageVersion)_sdk.json" />
125+
<Copy Condition="$(CI) and '$(BUILD_SOURCEBRANCHNAME)' != ''" SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(BUILD_SOURCEBRANCHNAME)_sdk.json" />
126+
<Copy SourceFiles="$(OutputPath)SdkInstaller.json" DestinationFiles="$(PackageOutputPath)/metadata/sdks/$(PackageReferenceVersion)_sdk.json" />
135127
</Target>
136128

137129
<Target Name="_CopyManifest" AfterTargets="Build">
@@ -142,4 +134,4 @@
142134
<Copy SourceFiles="@(_Files)" DestinationFolder="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.maui" />
143135
</Target>
144136

145-
</Project>
137+
</Project>

0 commit comments

Comments
 (0)