Skip to content

Use arcade power source build infra #58651

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.

Sign up for GitHub

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

Merged
Anipik merged 3 commits into from
Sep 14, 2021
Merged

Use arcade power source build infra #58651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
329bbf5
add yml files
Sep 10, 2021
6143407
add file version and condition package reference on source build
Sep 10, 2021
d948056
to avoid copying the file from the cache
Sep 13, 2021
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
Next Next commit
add yml files
  • Loading branch information
Anirudh Agnihotry committed Sep 10, 2021
commit 329bbf52032f4f13ac9c111b4390e6ab3696e11b
16 changes: 12 additions & 4 deletions eng/pipelines/common/global-build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ jobs:
inputs:
artifact: Mono_Offsets_${{monoCrossAOTTargetOS}}
path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles'

- ${{ if eq(parameters.buildingOnSourceBuildImage, true) }}:
- template: /eng/common/templates/steps/source-build.yml
parameters:
platform:
buildScript: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt)
Copy link
Member

@ViktorHofer ViktorHofer Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that the right command to invoke? cc @MichaelSimons

Copy link
Member

@MichaelSimons MichaelSimons Sep 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. This is just the build script, the template defaults to specify all of the correct args.

Copy link
Member

@ViktorHofer ViktorHofer Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And is the _sclEnableCommand still needed?

runtime/eng/pipelines/common/global-build-job.yml

Line 100 in d841f5e

value: scl enable llvm-toolset-7.0 --

Copy link
Contributor Author

@Anipik Anipik Sep 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes otherwise we get clang failures.

nonPortable: true

- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}:
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO
Expand All @@ -140,10 +147,11 @@ jobs:
displayName: Install native dependencies

# Build
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
displayName: Build product
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
continueOnError: ${{ parameters.shouldContinueOnError }}
- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
displayName: Build product
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
continueOnError: ${{ parameters.shouldContinueOnError }}

- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
- script: |
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/global-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,4 @@ jobs:
- SourceBuild_Linux_x64
jobParameters:
nameSuffix: SourceBuild
buildArgs: -subset clr+libs+host+packs /p:DotNetBuildFromSource=true --portableBuild false
timeoutInMinutes: 90
13 changes: 13 additions & 0 deletions eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,19 @@ stages:
isOfficialAllConfigurations: true
liveRuntimeBuildConfig: release

#
# Build Sourcebuild leg
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: Release
helixQueueGroup: ci
platforms:
- SourceBuild_Linux_x64
jobParameters:
nameSuffix: SourceBuild

#
# Installer Build
#
Expand Down