dnrops
/
dotnet_runtime
mirror of https://github.com/dotnet/runtime
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't pass down netcoreapp in yml builds

This commit is contained in:
Santiago Fernandez Madero 2020-01-16 16:14:07 -08:00
parent 6b101e01c3
commit 52d67af035
13 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/pipelines/coreclr/templates/build-test-job.yml
View File

@ -67,7 +67,7 @@ jobs:
dependsOn: dependsOn:
- ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
${{ if eq(parameters.testGroup, 'innerloop') }}: ${{ if eq(parameters.testGroup, 'innerloop') }}:

2
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
View File

@ -70,7 +70,7 @@ jobs:
dependsOn: dependsOn:
- ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
# Run all steps in the container. # Run all steps in the container.
# Note that the containers are defined in platform-matrix.yml # Note that the containers are defined in platform-matrix.yml

2
eng/pipelines/coreclr/templates/perf-job.yml
View File

@ -30,7 +30,7 @@ jobs:
dependsOn: dependsOn:
- ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
${{ if eq(parameters.osGroup, 'Windows_NT') }}: ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }} extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }}

2
eng/pipelines/coreclr/templates/run-test-job.yml
View File

@ -58,7 +58,7 @@ jobs:
- ${{ if ne(parameters.stagedBuild, true) }}: - ${{ if ne(parameters.stagedBuild, true) }}:
- ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', 'netcoreapp', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }} - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
# Compute job name from template parameters # Compute job name from template parameters
${{ if eq(parameters.testGroup, 'innerloop') }}: ${{ if eq(parameters.testGroup, 'innerloop') }}:

4
eng/pipelines/installer/jobs/base-job.yml
View File

@ -314,7 +314,7 @@ jobs:
parameters.archType, parameters.archType,
parameters.liveCoreClrBuildConfig) }} parameters.liveCoreClrBuildConfig) }}
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
- libraries_build_netcoreapp_${{ format('{0}{1}_{2}_{3}', - libraries_build_${{ format('{0}{1}_{2}_{3}',
parameters.osGroup, parameters.osGroup,
parameters.osSubgroup, parameters.osSubgroup,
parameters.archType, parameters.archType,
@ -324,7 +324,7 @@ jobs:
- ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
- ${{ each platform in parameters.platforms }}: - ${{ each platform in parameters.platforms }}:
- coreclr_product_build_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }} - coreclr_product_build_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}
- libraries_build_netcoreapp_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }} - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
steps: steps:

7
eng/pipelines/libraries/base-job.yml
View File

@ -21,11 +21,12 @@ parameters:
jobs: jobs:
- template: /eng/common/templates/job/job.yml - template: /eng/common/templates/job/job.yml
parameters: parameters:
name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
${{ if eq(parameters.framework, 'netcoreapp') }}:
displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} displayName: ${{ format('Libraries {0} {1}{2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if ne(parameters.framework, 'netcoreapp') }}: name: ${{ format('libraries_{0}_{1}{2}_{3}_{4}', parameters.name, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }} displayName: ${{ format('Libraries {0} {1} {2} {3} {4}', parameters.displayName, parameters.osGroup, parameters.framework, parameters.archType, parameters.buildConfig) }}
name: ${{ format('libraries_{0}_{1}_{2}{3}_{4}_{5}', parameters.name, parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed enableTelemetry: ${{ parameters.isOfficialBuild }} # TODO: figure out if it's needed
container: ${{ parameters.container }} container: ${{ parameters.container }}

6
eng/pipelines/libraries/build-job.yml
View File

@ -3,7 +3,7 @@ parameters:
osGroup: '' osGroup: ''
osSubgroup: '' osSubgroup: ''
archType: '' archType: ''
framework: netcoreapp framework: ''
isOfficialBuild: false isOfficialBuild: false
isOfficialAllConfigurations: false isOfficialAllConfigurations: false
@ -126,8 +126,8 @@ jobs:
- task: CopyFiles@2 - task: CopyFiles@2
displayName: Prepare shared framework runtime folder to publish displayName: Prepare shared framework runtime folder to publish
inputs: inputs:
sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime # The hardcoded target framework should be removed when we drop the support for versionless targetframeworks from ci. sourceFolder: $(Build.SourcesDirectory)/artifacts/bin/pkg
targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg/netcoreapp5.0/runtime targetFolder: $(Build.ArtifactStagingDirectory)/artifacts/bin/pkg
- task: CopyFiles@2 - task: CopyFiles@2
displayName: Prepare docs folder to publish displayName: Prepare docs folder to publish

7
eng/pipelines/libraries/build-test-job.yml
View File

@ -3,7 +3,7 @@ parameters:
osGroup: '' osGroup: ''
osSubgroup: '' osSubgroup: ''
archType: '' archType: ''
framework: netcoreapp framework: ''
isOfficialBuild: false isOfficialBuild: false
liveCoreClrBuildConfig: '' liveCoreClrBuildConfig: ''
timeoutInMinutes: 150 timeoutInMinutes: 150
@ -34,7 +34,10 @@ jobs:
displayName: 'Test Build' displayName: 'Test Build'
dependsOn: dependsOn:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
- ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
variables: variables:
- librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }} - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }}

4
eng/pipelines/libraries/helix-queues-setup.yml
View File

@ -75,7 +75,7 @@ jobs:
# Windows_NT x64 # Windows_NT x64
- ${{ if eq(parameters.platform, 'Windows_NT_x64') }}: - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
# netcoreapp # netcoreapp
- ${{ if eq(parameters.jobParameters.framework, 'netcoreapp') }}: - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.7.Amd64.Open - Windows.7.Amd64.Open
- Windows.81.Amd64.Open - Windows.81.Amd64.Open
@ -99,7 +99,7 @@ jobs:
# Windows_NT x86 # Windows_NT x86
- ${{ if eq(parameters.platform, 'Windows_NT_x86') }}: - ${{ if eq(parameters.platform, 'Windows_NT_x86') }}:
# netcoreapp # netcoreapp
- ${{ if eq(parameters.jobParameters.framework, 'netcoreapp') }}: - ${{ if notIn(parameters.jobParameters.framework, 'allConfigurations', 'net472') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.7.Amd64.Open - Windows.7.Amd64.Open
- Windows.81.Amd64.Open - Windows.81.Amd64.Open

2
eng/pipelines/libraries/outerloop.yml
View File

@ -61,7 +61,6 @@ jobs:
jobParameters: jobParameters:
isOfficialBuild: ${{ variables['isOfficialBuild'] }} isOfficialBuild: ${{ variables['isOfficialBuild'] }}
isFullMatrix: ${{ variables['isFullMatrix'] }} isFullMatrix: ${{ variables['isFullMatrix'] }}
framework: netcoreapp
runTests: true runTests: true
testScope: outerloop testScope: outerloop
liveCoreClrBuildConfig: release liveCoreClrBuildConfig: release
@ -83,7 +82,6 @@ jobs:
jobParameters: jobParameters:
isOfficialBuild: ${{ variables['isOfficialBuild'] }} isOfficialBuild: ${{ variables['isOfficialBuild'] }}
isFullMatrix: ${{ variables['isFullMatrix'] }} isFullMatrix: ${{ variables['isFullMatrix'] }}
framework: netcoreapp
runTests: true runTests: true
testScope: outerloop testScope: outerloop
liveCoreClrBuildConfig: release liveCoreClrBuildConfig: release

10
eng/pipelines/libraries/run-test-job.yml
View File

@ -3,7 +3,7 @@ parameters:
osGroup: '' osGroup: ''
osSubgroup: '' osSubgroup: ''
archType: '' archType: ''
framework: netcoreapp framework: ''
isOfficialBuild: false isOfficialBuild: false
liveCoreClrBuildConfig: '' liveCoreClrBuildConfig: ''
timeoutInMinutes: 150 timeoutInMinutes: 150
@ -37,8 +37,12 @@ jobs:
name: test_run name: test_run
dependsOn: dependsOn:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if notIn(parameters.framework, 'allConfigurations', 'net472') }}:
- ${{ format('libraries_test_build_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }} - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ format('libraries_test_build_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
- ${{ if in(parameters.framework, 'allConfigurations', 'net472') }}:
- ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
- ${{ format('libraries_test_build_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
- ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}: - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
- ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveCoreClrBuildConfig) }} - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveCoreClrBuildConfig) }}

6
eng/pipelines/runtime.yml
View File

@ -218,7 +218,6 @@ jobs:
- ${{ if eq(variables['isFullMatrix'], false) }}: - ${{ if eq(variables['isFullMatrix'], false) }}:
- Windows_NT_x86 - Windows_NT_x86
jobParameters: jobParameters:
framework: netcoreapp
liveCoreClrBuildConfig: release liveCoreClrBuildConfig: release
condition: >- condition: >-
or( or(
@ -430,7 +429,6 @@ jobs:
jobParameters: jobParameters:
isOfficialBuild: false isOfficialBuild: false
isFullMatrix: ${{ variables.isFullMatrix }} isFullMatrix: ${{ variables.isFullMatrix }}
framework: netcoreapp
testScope: innerloop testScope: innerloop
liveCoreClrBuildConfig: release liveCoreClrBuildConfig: release
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@ -463,7 +461,6 @@ jobs:
jobParameters: jobParameters:
isOfficialBuild: false isOfficialBuild: false
isFullMatrix: ${{ variables.isFullMatrix }} isFullMatrix: ${{ variables.isFullMatrix }}
framework: netcoreapp
testScope: innerloop testScope: innerloop
liveCoreClrBuildConfig: release liveCoreClrBuildConfig: release
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@ -489,7 +486,6 @@ jobs:
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
helixQueueGroup: libraries helixQueueGroup: libraries
jobParameters: jobParameters:
framework: netcoreapp
testScope: innerloop testScope: innerloop
liveCoreClrBuildConfig: checked liveCoreClrBuildConfig: checked
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@ -510,7 +506,6 @@ jobs:
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
helixQueueGroup: libraries helixQueueGroup: libraries
jobParameters: jobParameters:
framework: netcoreapp
testScope: innerloop testScope: innerloop
liveCoreClrBuildConfig: checked liveCoreClrBuildConfig: checked
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
@ -533,7 +528,6 @@ jobs:
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
helixQueueGroup: libraries helixQueueGroup: libraries
jobParameters: jobParameters:
framework: netcoreapp
testScope: innerloop testScope: innerloop
liveCoreClrBuildConfig: checked liveCoreClrBuildConfig: checked
dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}

6
src/libraries/Directory.Build.props
View File

@ -57,10 +57,6 @@
<!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set --> <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set -->
<BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration> <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
<!-- This is in order for yml files to not need to be updated every new release and so that we can pass down versionless
netcoreapp framework which its update is driven by NetCoreAppCurrent -->
<BuildConfiguration Condition="'$(TargetGroup)' == 'netcoreapp'">$(NetCoreAppCurrent)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration>
<!-- if PKGPROJ doesn't set BuildConfigurations, make sure it only builds for TargetGroup=package or BuildAllConfigurations --> <!-- if PKGPROJ doesn't set BuildConfigurations, make sure it only builds for TargetGroup=package or BuildAllConfigurations -->
<BuildConfigurations Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(BuildConfigurations)' == ''">package</BuildConfigurations> <BuildConfigurations Condition="'$(MSBuildProjectExtension)' == '.pkgproj' and '$(BuildConfigurations)' == ''">package</BuildConfigurations>
</PropertyGroup> </PropertyGroup>
@ -271,8 +267,6 @@
<!-- Paths to binplace package content --> <!-- Paths to binplace package content -->
<NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath> <NETCoreAppPackageRefPath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\ref</NETCoreAppPackageRefPath>
<NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath> <NETCoreAppPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetCoreAppCurrent)\lib</NETCoreAppPackageRuntimePath>
<NetFxPackageRefPath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\ref</NetFxPackageRefPath>
<NetFxPackageRuntimePath>$(ArtifactsBinDir)pkg\$(NetFrameworkCurrent)\lib</NetFxPackageRuntimePath>
<TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath> <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>