-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Join assets from verticals in the final join point (#43627)
Co-authored-by: Matt Mitchell <mmitche@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
- Loading branch information
3 people
authored
Oct 17, 2024
1 parent
ce0abad
commit ea38eba
Showing
12 changed files
with
755 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| parameters: | ||
| # Branch of the VMR to use (to push to for internal builds) | ||
| - name: vmrBranch | ||
| type: string | ||
| default: $(Build.SourceBranch) | ||
|
|
||
| - name: pool_Windows | ||
| type: object | ||
| default: | ||
| name: $(defaultPoolName) | ||
| image: $(poolImage_Windows) | ||
| demands: ImageOverride -equals $(poolImage_Windows) | ||
| os: windows | ||
|
|
||
| stages: | ||
| - stage: VMR_Final_Join | ||
| displayName: VMR Final Join | ||
| dependsOn: VMR_Vertical_Build | ||
| condition: succeededOrFailed() | ||
| variables: | ||
| - template: ../variables/vmr-build.yml | ||
| parameters: | ||
| vmrBranch: ${{ parameters.vmrBranch }} | ||
|
|
||
| jobs: | ||
| - job: FinalJoin | ||
| displayName: Final Build Pass | ||
| pool: ${{ parameters.pool_Windows }} | ||
| timeoutInMinutes: 240 | ||
| templateContext: | ||
| outputs: | ||
| - output: buildArtifacts | ||
| PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/MergedManifest.xml | ||
| ArtifactName: AssetManifests | ||
| displayName: Publish Merged Manifest | ||
| sbomEnabled: false | ||
| - output: buildArtifacts | ||
| PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/assets | ||
| ArtifactName: BlobArtifacts | ||
| displayName: Publish Blob Artifacts | ||
| sbomEnabled: false | ||
| - output: buildArtifacts | ||
| PathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/packages | ||
| ArtifactName: PackageArtifacts | ||
| displayName: Publish Package Artifacts | ||
| sbomEnabled: false | ||
| steps: | ||
| - template: ../steps/vmr-join-verticals.yml | ||
| parameters: | ||
| dotNetBuildPass: final | ||
| primaryDependentJob: Windows_x64 | ||
| outputFolder: $(Build.ArtifactStagingDirectory)/artifacts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| parameters: | ||
| - name: dotNetBuildPass | ||
| type: string | ||
| default: final | ||
|
|
||
| - name: primaryDependentJob | ||
| type: string | ||
| default: Windows_x64 | ||
|
|
||
| - name: outputFolder | ||
| type: string | ||
| default: $(Build.ArtifactStagingDirectory)/artifacts | ||
|
|
||
| steps: | ||
| - task: DownloadBuildArtifacts@1 | ||
| inputs: | ||
| artifactName: 'VerticalManifests' | ||
| downloadPath: $(Build.ArtifactStagingDirectory) | ||
| checkDownloadedFiles: true | ||
|
|
||
| - task: DownloadPipelineArtifact@2 | ||
| inputs: | ||
| artifactName: ${{ parameters.primaryDependentJob }}_Artifacts | ||
| targetPath: $(Build.ArtifactStagingDirectory)/${{ parameters.primaryDependentJob }}_Artifacts | ||
| checkDownloadedFiles: true | ||
|
|
||
| - powershell: eng/join-verticals.ps1 | ||
| /p:VerticalManifestsPath=$(Build.ArtifactStagingDirectory)/VerticalManifests | ||
| /p:MainVertical=${{ parameters.primaryDependentJob }} | ||
| /p:DotNetBuildPass=${{ parameters.dotNetBuildPass }} | ||
| /p:BuildId=$(Build.BuildId) | ||
| /p:AzureDevOpsToken=$(System.AccessToken) | ||
| /p:AzureDevOpsBaseUri=$(System.CollectionUri) | ||
| /p:AzureDevOpsProject=$(System.TeamProject) | ||
| /p:MainVerticalArtifactsFolder=$(Build.ArtifactStagingDirectory)/${{ parameters.primaryDependentJob }}_Artifacts | ||
| /p:OutputFolder=${{ parameters.outputFolder }} | ||
| displayName: Join Verticals |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <Project Sdk="Microsoft.Build.Traversal"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>$(NetCurrent)</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="$(TasksDir)Microsoft.DotNet.UnifiedBuild.Tasks\Microsoft.DotNet.UnifiedBuild.Tasks.csproj" BuildInParallel="true" /> | ||
| </ItemGroup> | ||
|
|
||
| <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.JoinVerticals" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" /> | ||
| <Target Name="JoinVerticals" DependsOnTargets="ResolveProjectReferences" AfterTargets="Build"> | ||
| <Error Condition="'$(MainVertical)' == ''" Text="MainVertical is not set." /> | ||
| <Error Condition="'$(VerticalManifestsPath)' == ''" Text="VerticalManifestsPath is not set." /> | ||
| <Error Condition="'$(BuildId)' == ''" Text="BuildId is not set." /> | ||
| <Error Condition="'$(AzureDevOpsBaseUri)' == ''" Text="AzureDevOpsBaseUri is not set." /> | ||
| <Error Condition="'$(AzureDevOpsProject)' == ''" Text="AzureDevOpsProject is not set." /> | ||
| <Error Condition="'$(MainVerticalArtifactsFolder)' == ''" Text="MainVerticalArtifactsFolder is not set." /> | ||
| <Error Condition="'$(OutputFolder)' == ''" Text="OutputFolder is not set." /> | ||
|
|
||
| <ItemGroup> | ||
| <VerticalManifest | ||
| Include="$(VerticalManifestsPath)\*.xml" | ||
| Exclude="$(VerticalManifestsPath)\*Mono*.xml;$(VerticalManifestsPath)\*Pgo*.xml;$(VerticalManifestsPath)\*Shortstack*.xml;$(VerticalManifestsPath)\*DevVersions*.xml" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- AzureDevOpsToken shouldn't be set when running in dnceng-public --> | ||
| <Microsoft.DotNet.UnifiedBuild.Tasks.JoinVerticals | ||
| VerticalManifest="@(VerticalManifest)" | ||
| MainVertical="$(MainVertical)" | ||
| BuildId="$(BuildId)" | ||
| AzureDevOpsToken="$(AzureDevOpsToken)" | ||
| AzureDevOpsBaseUri="$(AzureDevOpsBaseUri)" | ||
| AzureDevOpsProject="$(AzureDevOpsProject)" | ||
| MainVerticalArtifactsFolder="$(MainVerticalArtifactsFolder)" | ||
| OutputFolder="$(OutputFolder)" /> | ||
| </Target> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| [CmdletBinding(PositionalBinding=$false)] | ||
| Param( | ||
| [string][Alias('v')]$verbosity = "minimal", | ||
| [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties | ||
| ) | ||
|
|
||
| $useGlobalNuGetCache=$false | ||
| $ci = $true | ||
|
|
||
| . $PSScriptRoot\common\tools.ps1 | ||
|
|
||
| $project = Join-Path $EngRoot "join-verticals.proj" | ||
| $arguments = @() | ||
| $targets = "/t:JoinVerticals" | ||
|
|
||
| try { | ||
| $bl = '/bl:' + (Join-Path $LogDir 'JoinVerticals.binlog') | ||
|
|
||
| MSBuild -restore ` | ||
| $project ` | ||
| $bl ` | ||
| $targets ` | ||
| /p:Configuration=Release ` | ||
| @properties ` | ||
| @arguments | ||
| } | ||
| catch { | ||
| Write-Host $_.ScriptStackTrace | ||
| Write-PipelineTelemetryError -Category 'Build' -Message $_ | ||
| ExitWithExitCode 1 | ||
| } | ||
|
|
||
| ExitWithExitCode 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.