-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge CoreCLR-based official builds legs into one leg per pla…
- Loading branch information
1 parent
1bfcdab
commit 0bb5e06
Showing
14 changed files
with
321 additions
and
317 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 was deleted.
Oops, something went wrong.
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
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,80 @@ | ||
| parameters: | ||
| archType: '' | ||
| isOfficialBuild: false | ||
| osGroup: '' | ||
| osSubgroup: '' | ||
| hostArchType: '' | ||
|
|
||
| steps: | ||
| # Always build the crossdac, that way we know in CI/PR if things break to build. | ||
| - ${{ if and(eq(parameters.osGroup, 'windows'), notin(parameters.archType, 'x86')) }}: | ||
| - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os linux -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents | ||
| displayName: Build Cross OS Linux DAC for Windows | ||
|
|
||
| - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os alpine -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents | ||
| displayName: Build Cross OS Linux-musl DAC for Windows | ||
|
|
||
| - powershell: | | ||
| function CopyAndVerifyCrossOsAssets { | ||
| [CmdletBinding()] | ||
| param ( | ||
| [Parameter(Mandatory)][string]$crossDacDir, | ||
| [Parameter(Mandatory)][string]$targetDir | ||
| ) | ||
| $crossDacDir = Join-Path $crossDacDir -ChildPath '${{ parameters.hostArchType }}' | ||
| $availableFiles = ls -File $crossDacDir | ||
| Write-Host "Probed for files in ""$crossDacDir"", found:" | ||
| $availableFiles | fl | ||
| if (-not ("mscordaccore.dll" -in $availableFiles.Name ` | ||
| -and "mscordaccore.pdb" -in $availableFiles.Name ` | ||
| -and "mscordbi.dll" -in $availableFiles.Name ` | ||
| -and "mscordbi.pdb" -in $availableFiles.Name` | ||
| )) | ||
| { | ||
| Write-Error "Couldn't find one of the expected crossdac files." | ||
| } | ||
| New-Item $targetDir -ItemType 'Directory' -Force -ea 0 | ||
| $availableFiles | %{ cp $_.FullName $targetDir -v } | ||
| } | ||
| $buildMuslDacRootFolderPath = "$(Build.SourcesDirectory)/artifacts/bin/coreclr/alpine.${{ parameters.archType }}.$(buildConfigUpper)" | ||
| $buildMuslStagingPath = "$(crossDacArtifactPath)/Linux_musl.${{ parameters.archType }}.$(buildConfigUpper)/${{ parameters.hostArchType }}" | ||
| $buildLinuxDacRootFolderPath = "$(Build.SourcesDirectory)/artifacts/bin/coreclr/Linux.${{ parameters.archType }}.$(buildConfigUpper)" | ||
| $buildLinuxDacStagingPath = "$(crossDacArtifactPath)/Linux.${{ parameters.archType }}.$(buildConfigUpper)/${{ parameters.hostArchType }}" | ||
| CopyAndVerifyCrossOsAssets -CrossDacDir $buildMuslDacRootFolderPath -TargetDir $buildMuslStagingPath | ||
| CopyAndVerifyCrossOsAssets -CrossDacDir $buildLinuxDacRootFolderPath -TargetDir $buildLinuxDacStagingPath | ||
| Write-Host "Final directory contents:" | ||
| ls -R $(crossDacArtifactPath) | ||
| displayName: Gather CrossDac Artifacts | ||
| - template: /eng/pipelines/coreclr/templates/sign-diagnostic-files.yml | ||
| parameters: | ||
| basePath: $(crossDacArtifactPath) | ||
| isOfficialBuild: ${{ parameters.isOfficialBuild }} | ||
| timeoutInMinutes: 30 | ||
|
|
||
| - ${{ if eq(parameters.osGroup, 'linux') }}: | ||
| - task: CopyFiles@2 | ||
| displayName: Gather runtime for CrossDac | ||
| inputs: | ||
| SourceFolder: $(coreClrProductRootFolderPath) | ||
| Contents: libcoreclr.so | ||
| TargetFolder: '$(crossDacArtifactPath)/${{ parameters.osGroup }}${{ parameters.osSubgroup }}.$(archType).$(buildConfigUpper)/${{ parameters.hostArchType }}' | ||
|
|
||
| # Make the assets available in a single container for the packaging job. | ||
| - task: PublishBuildArtifacts@1 | ||
| displayName: Publish runtime for CrossDac | ||
| inputs: | ||
| pathtoPublish: $(crossDacArtifactPath) | ||
| PublishLocation: Container | ||
| artifactName: $(buildCrossDacArtifactName) |
This file was deleted.
Oops, something went wrong.
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,75 @@ | ||
| parameters: | ||
| archType: '' | ||
| buildConfig: '' | ||
| container: '' | ||
| crossDacPlatforms: {} | ||
| dependOnEvaluatePaths: false | ||
| isOfficialBuild: false | ||
| osGroup: '' | ||
| osSubgroup: '' | ||
| platform: '' | ||
| pool: '' | ||
| runtimeVariant: '' | ||
| testGroup: '' | ||
| timeoutInMinutes: '' | ||
| variables: {} | ||
|
|
||
| jobs: | ||
| - template: xplat-pipeline-job.yml | ||
| parameters: | ||
| archType: ${{ parameters.archType }} | ||
| buildConfig: ${{ parameters.buildConfig }} | ||
| container: ${{ parameters.container }} | ||
| condition: ${{ parameters.isOfficialBuild }} | ||
| helixType: 'build/product/' | ||
| osGroup: ${{ parameters.osGroup }} | ||
| osSubgroup: ${{ parameters.osSubgroup }} | ||
| pool: ${{ parameters.pool }} | ||
| runtimeVariant: ${{ parameters.runtimeVariant }} | ||
| timeoutInMinutes: ${{ parameters.timeoutInMinutes }} | ||
| dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} | ||
|
|
||
| name: crossdacpack | ||
| displayName: CrossDac Packaging | ||
|
|
||
| variables: | ||
| - name: officialBuildIdArg | ||
| value: '' | ||
| - name: crossDacArgs | ||
| value: '/p:CrossDacArtifactsDir=$(crossDacArtifactPath)/$(buildCrossDacArtifactName)' | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}: | ||
| - name: officialBuildIdArg | ||
| value: '/p:OfficialBuildId=$(Build.BuildNumber)' | ||
| - name: SignType | ||
| value: $[ coalesce(variables.OfficialSignType, 'real') ] | ||
| - ${{ parameters.variables }} | ||
|
|
||
| dependsOn: | ||
| - ${{ if ne(parameters.crossDacPlatforms, '') }}: | ||
| - ${{ each platform in parameters.crossDacPlatforms }}: | ||
| - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.buildConfig }} | ||
|
|
||
| steps: | ||
| - task: DownloadBuildArtifacts@0 | ||
| displayName: Download CrossDac artifacts | ||
| inputs: | ||
| artifactName: $(buildCrossDacArtifactName) | ||
| downloadPath: $(crossDacArtifactPath) | ||
| checkDownloadedFiles: true | ||
|
|
||
| - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset crossdacpack -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) $(crossDacArgs) -ci | ||
| displayName: Build crossdac packaging | ||
|
|
||
| # Save packages using the prepare-signed-artifacts format. | ||
| - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml | ||
| parameters: | ||
| name: ${{ parameters.platform }} | ||
|
|
||
| # Upload to artifacts to be signed | ||
| - task: PublishPipelineArtifact@1 | ||
| displayName: Publish Logs | ||
| inputs: | ||
| targetPath: $(Build.SourcesDirectory)/artifacts/log | ||
| artifactName: 'CrossDacPackagingLogs_Attempt$(System.JobAttempt)' | ||
| continueOnError: true | ||
| condition: always() |
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.