Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ parameters:
shouldContinueOnError: false
dependOnEvaluatePaths: false
isOfficialBuild: false
buildingOnSourceBuildImage: false
runtimeFlavor: 'coreclr'
helixQueues: ''
enablePublishTestResults: false
Expand Down Expand Up @@ -51,15 +52,15 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}

${{ if eq(parameters.dependOnEvaluatePaths, true) }}:
dependsOn:
dependsOn:
- evaluate_paths
- ${{ if ne(parameters.dependsOn,'') }}:
- ${{ parameters.dependsOn }}

variables:
- name: _osParameter
value: -os ${{ parameters.osGroup }}

- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
- name: _osParameter
value: /p:RuntimeOS=linux-musl /p:OutputRid=linux-musl-${{ parameters.archType }}
Expand All @@ -79,13 +80,20 @@ jobs:
value: /p:OfficialBuildId=$(Build.BuildNumber)
${{ if ne(parameters.isOfficialBuild, true) }}:
value: ''

- name: _richCodeNavigationParam
${{ if eq(parameters.enableRichCodeNavigation, true) }}:
value: /p:EnableRichCodeNavigation=true
${{ if ne(parameters.enableRichCodeNavigation, true) }}:
value: ''

- name: _sclEnableCommand
${{ if eq(parameters.buildingOnSourceBuildImage, true) }}:
value: scl enable llvm-toolset-7.0 --
${{ if ne(parameters.buildingOnSourceBuildImage, true) }}:
value: ''


- ${{ each variable in parameters.variables }}:
- ${{ variable }}

Expand Down Expand Up @@ -124,7 +132,7 @@ jobs:
displayName: Install native dependencies

# Build
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam)
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam)
displayName: Build product
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
continueOnError: ${{ parameters.shouldContinueOnError }}
Expand Down
25 changes: 25 additions & 0 deletions eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,31 @@ jobs:
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Linux x64 Source Build

- ${{ if containsValue(parameters.platforms, 'SourceBuild_Linux_x64') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
variables: ${{ parameters.variables }}
osGroup: Linux
archType: x64
targetRid: linux-x64
platform: Linux_x64
container:
image: centos-7-source-build-20210408124356-5d87b80
registry: mcr
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}
buildingOnSourceBuildImage: true

# WebAssembly

- ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/global-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ jobs:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: release
platforms:
- Linux_x64
- SourceBuild_Linux_x64
jobParameters:
nameSuffix: SourceBuild
buildArgs: /p:DotNetBuildFromSource=true
buildArgs: -subset clr+libs+host+packs /p:DotNetBuildFromSource=true
timeoutInMinutes: 90