Skip to content
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.

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

Compress mono builds that don't run tests to single jobs #37373

Merged
merged 3 commits into from
Jun 4, 2020
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: 13 additions & 3 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ parameters:
variables: {}
timeoutInMinutes: ''
pool: ''
condition: true

jobs:
- template: /eng/common/templates/job/job.yml
Expand All @@ -19,10 +20,19 @@ jobs:
pool: ${{ parameters.pool }}
container: ${{ parameters.container }}
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
condition: and(succeeded(), ${{ parameters.condition }})
workspace:
clean: all

variables: ${{ parameters.variables }}
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 }}

- ${{ parameters.variables }}

steps:
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
Expand All @@ -37,7 +47,7 @@ jobs:
displayName: Disk Usage before Build

# Build
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} ${{ parameters.buildArgs }}
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }}
displayName: Build product

- ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}:
Expand All @@ -51,6 +61,6 @@ jobs:
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/'
PublishLocation: Container
ArtifactName: $(Agent.Os)_PublishBuildAssets
ArtifactName: Logs_Build_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
continueOnError: true
condition: always()
15 changes: 15 additions & 0 deletions eng/pipelines/common/xplat-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ jobs:
- name: System.DisableZipDownload
value: true

- ${{ if eq(parameters.jobParameters.buildConfig, 'checked') }}:
- name: buildConfigUpper
value: 'Checked'

- ${{ if eq(parameters.jobParameters.buildConfig, 'debug') }}:
- name: buildConfigUpper
value: 'Debug'

- ${{ if eq(parameters.jobParameters.buildConfig, 'release') }}:
- name: buildConfigUpper
value: 'Release'

- name: _BuildConfig
value: $(buildConfigUpper)

- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- name: archiveExtension
value: '.zip'
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/coreclr/templates/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
- template: xplat-pipeline-job.yml
parameters:
buildConfig: ${{ parameters.buildConfig }}
_BuildConfig: ${{ parameters.buildConfig }}
archType: ${{ parameters.archType }}
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup }}
Expand Down
15 changes: 0 additions & 15 deletions eng/pipelines/coreclr/templates/xplat-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,6 @@ jobs:
- name: buildConfig
value: ${{ parameters.buildConfig }}

- ${{ if eq(parameters.buildConfig, 'checked') }}:
- name: buildConfigUpper
value: 'Checked'

- ${{ if eq(parameters.buildConfig, 'debug') }}:
- name: buildConfigUpper
value: 'Debug'

- ${{ if eq(parameters.buildConfig, 'release') }}:
- name: buildConfigUpper
value: 'Release'

- name: _BuildConfig
value: $(buildConfigUpper)

- name: archType
value: ${{ parameters.archType }}

Expand Down
3 changes: 0 additions & 3 deletions eng/pipelines/installer/jobs/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ jobs:

- name: OfficialBuildArg
value: ''

- name: _BuildConfig
value: ${{ parameters.buildConfig }}

- name: SkipTests
value: ${{ or(
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/libraries/base-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
pool: ${{ parameters.pool }}
variables:
- _buildScriptFileName: build
- _BuildConfig: ${{ parameters.buildConfig }}

- _msbuildCommonParameters: ''
# rename this variable, due to collision with build-native.proj
Expand Down
11 changes: 0 additions & 11 deletions eng/pipelines/mono/templates/xplat-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ jobs:
- name: buildConfig
value: ${{ parameters.buildConfig }}

- ${{ if eq(parameters.buildConfig, 'debug') }}:
- name: buildConfigUpper
value: 'Debug'

- ${{ if eq(parameters.buildConfig, 'release') }}:
- name: buildConfigUpper
value: 'Release'

- name: _BuildConfig
value: $(buildConfigUpper)

- name: archType
value: ${{ parameters.archType }}

Expand Down
Loading