-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Revert "[release/9.0] Fix intermediate artifact upload collisions for NativeAOT and Mono" #125829
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -300,7 +300,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: NativeAOTRuntimePacks_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: NativeAOTRuntimePacks | ||||
|
|
||||
| # | ||||
| # Build Mono runtime packs | ||||
|
|
@@ -344,7 +344,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
Comment on lines
344
to
+347
|
||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
|
|
@@ -362,7 +362,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
|
|
@@ -380,7 +380,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_multithread_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| # Build Mono AOT offset headers once, for consumption elsewhere | ||||
| # | ||||
|
|
@@ -452,7 +452,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_crossaot_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
|
|
@@ -480,7 +480,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_crossaot_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| - template: /eng/pipelines/common/platform-matrix.yml | ||||
| parameters: | ||||
|
|
@@ -514,7 +514,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_crossaot_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| # | ||||
| # Build Mono LLVM runtime packs | ||||
|
|
@@ -546,7 +546,7 @@ extends: | |||
| postBuildSteps: | ||||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||||
| parameters: | ||||
| name: MonoRuntimePacks_llvmaot_$(osGroup)$(osSubgroup)_$(archType) | ||||
| name: MonoRuntimePacks | ||||
|
|
||||
| # | ||||
| # Build libraries AllConfigurations for packages | ||||
|
|
@@ -620,34 +620,35 @@ extends: | |||
| artifact: 'IntermediateArtifacts' | ||||
| path: $(Build.SourcesDirectory)/artifacts/workloadPackages | ||||
| patterns: | | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.wasi-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.wasi-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvos-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.tvossimulator-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NETCore.App.Runtime.Mono.wasi-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Workload.Mono.ToolChain.net8.Manifest*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Runtime.MonoTargets.Sdk*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Runtime.MonoAOTCompiler.Task*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Runtime.WebAssembly.Sdk*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Runtime.WebAssembly.Wasi*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks*/Shipping/Microsoft.NET.Runtime.WebAssembly.Templates*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.wasi-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.AOT.win-arm64.Cross.wasi-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.android-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.ios-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.iossimulator-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.maccatalyst-*.nupkg | ||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg | ||||
|
||||
| IntermediateArtifacts/MonoRuntimePacks/Shipping/Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm*.nupkg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
upload-intermediate-artifacts-step.ymlpublishes everything under$(Build.StagingDirectory)/IntermediateArtifacts/${{ parameters.name }}into the sharedIntermediateArtifactspipeline artifact. In thisplatform-matrix(many platforms/jobs), using a constantname: NativeAOTRuntimePacksmeans multiple jobs will publish into the same artifact subdirectory, which can overwrite/lose files (and was previously avoided by including$(osGroup)$(osSubgroup)_$(archType)). Consider restoring a job-unique suffix (e.g., include$(osGroup)$(osSubgroup)_$(archType)and/or the matrix variant) so each job publishes to its own subfolder.