Add support for building S.P.CoreLib in a separate job #34166
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,109 @@ | ||
| parameters: | ||
| archType: '' | ||
| buildConfig: '' | ||
| condition: true | ||
| container: '' | ||
| crossrootfsDir: '' | ||
| isOfficialBuild: false | ||
| osGroup: '' | ||
| osSubgroup: '' | ||
| platform: '' | ||
| pool: '' | ||
| signBinaries: false | ||
| stagedBuild: false | ||
| testGroup: '' | ||
| timeoutInMinutes: '' | ||
| variables: {} | ||
|
|
||
| ### Product build | ||
| jobs: | ||
| - template: xplat-pipeline-job.yml | ||
| parameters: | ||
| buildConfig: ${{ parameters.buildConfig }} | ||
| _BuildConfig: ${{ parameters.buildConfig }} | ||
| archType: ${{ parameters.archType }} | ||
| osGroup: ${{ parameters.osGroup }} | ||
| osSubgroup: ${{ parameters.osSubgroup }} | ||
| testGroup: ${{ parameters.testGroup }} | ||
| helixType: 'build/product/' | ||
| enableMicrobuild: true | ||
| stagedBuild: ${{ parameters.stagedBuild }} | ||
| pool: ${{ parameters.pool }} | ||
| condition: ${{ parameters.condition }} | ||
|
|
||
| name: ${{ format('coreclr_corelib_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} | ||
| displayName: ${{ format('CoreCLR CoreLib Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} | ||
|
|
||
| # Run all steps in the container. | ||
| # Note that the containers are defined in platform-matrix.yml | ||
| container: ${{ parameters.container }} | ||
|
|
||
| timeoutInMinutes: ${{ parameters.timeoutInMinutes }} | ||
|
|
||
| crossrootfsDir: ${{ parameters.crossrootfsDir }} | ||
|
|
||
| gatherAssetManifests: true | ||
| variables: | ||
| - name: osGroup | ||
| value: ${{ parameters.osGroup }} | ||
| - name: osSubgroup | ||
| value: ${{ parameters.osSubgroup }} | ||
| - name: compilerArg | ||
| value: '' | ||
| - name: publishLogsArtifactPrefix | ||
| value: 'BuildLogs_CoreLib' | ||
| - name: officialBuildIdArg | ||
| value: '' | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: | ||
| - name: officialBuildIdArg | ||
| value: '/p:OfficialBuildId=$(Build.BuildNumber)' | ||
|
|
||
| - ${{ parameters.variables }} | ||
|
|
||
| steps: | ||
|
|
||
| # Install native dependencies | ||
mangod9 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # Linux builds use docker images with dependencies preinstalled, | ||
| # and FreeBSD builds use a build agent with dependencies | ||
| # preinstalled, so we only need this step for OSX and Windows. | ||
| - ${{ if eq(parameters.osGroup, 'OSX') }}: | ||
| - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) | ||
| displayName: Install native dependencies | ||
| - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: | ||
| # Necessary to install python | ||
| - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force | ||
| displayName: Install native dependencies | ||
|
|
||
| # # Install internal tools on official builds | ||
| # # Since our internal tools are behind an authenticated feed, | ||
| # # we need to use the DotNetCli AzDO task to restore from the feed using a service connection. | ||
| # # We can't do this from within the build, so we need to do this as a separate step. | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: | ||
| - template: /eng/pipelines/common/restore-internal-tools.yml | ||
| parameters: | ||
| installDotnet: true | ||
|
|
||
| # Build Private CoreLib | ||
| - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subsetCategory coreclr -subset corelib $(crossArg) -arch $(archType) -c $(buildConfig) $(officialBuildIdArg) -ci | ||
mangod9 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| displayName: Build System.Private.CoreLib | ||
|
|
||
|
|
||
| # Publish corelib output directory for consumption by libraries. | ||
| - template: /eng/pipelines/common/upload-artifact-step.yml | ||
| parameters: | ||
| rootFolder: $(buildProductRootFolderPath) | ||
| includeRootFolder: false | ||
| archiveType: $(archiveType) | ||
| tarCompression: $(tarCompression) | ||
| archiveExtension: $(archiveExtension) | ||
| artifactName: $(corelibProductArtifactName) | ||
| displayName: Upload System.Private.CoreLib | ||
|
|
||
| # Publish Logs | ||
| - task: PublishPipelineArtifact@1 | ||
| displayName: Publish Logs | ||
| inputs: | ||
| targetPath: $(Build.SourcesDirectory)/artifacts/log | ||
| artifactName: '$(publishLogsArtifactPrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' | ||
| continueOnError: true | ||
| condition: always() | ||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -41,8 +41,19 @@ | |
| <Import Project="$(RepositoryEngineeringDir)coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" /> | ||
| <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> | ||
|
|
||
| <ItemGroup> | ||
| <SetupProjects Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" /> | ||
|
Member
There was a problem hiding this comment. This is CI only, why not directly invoking the runtime.depproj before tests.proj?
Member
Author
There was a problem hiding this comment. one issue is that build parallelization might cause a race, pretest.proj has to complete before tests start to build, since pretest generates the dep file to ensure testhost is setup correctly.
Member
There was a problem hiding this comment. Not following. You can do two steps before the test build so the sequence would be:
Noteworthy, if you would wait until Monday, we could just invoke the lib-pretest lib-tests subsets which would handle all that for you. I plan to merge this on Monday (if ready) which introduces the libraries subsets #33553.
Member
Author
There was a problem hiding this comment. I ideally want to merge this tomorrow, since this PR touches a bunch of infra pieces. I can commit to reworking this once your PR is merged.
Member
There was a problem hiding this comment. No problem at all, I can make the changes afterwards. |
||
| <SetupProjects Include="$(MSBuildThisFileDirectory)\pretest.proj" /> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="Build" DependsOnTargets="BuildAllProjects" /> | ||
| <Target Name="BuildAllProjects"> | ||
| <!-- These projects are required to restore the runtime and setup testhost --> | ||
| <MSBuild Targets="Build" | ||
| Projects="@(SetupProjects)" | ||
| Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true' and '$(ContinuousIntegrationBuild)' == 'true'" | ||
| BuildInParallel="false" | ||
| ContinueOnError="ErrorAndStop" /> | ||
| <MSBuild Targets="Build" | ||
| Projects="@(Project)" | ||
| Properties="BuildAllProjects=true;%(Project.AdditionalProperties)" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.