Skip to content

Commit

Permalink
Merged PR 21846: Remove checkout bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
hoyosjs authored and vseanreesermsft committed Mar 17, 2022
2 parents 81d52e2 + 8664948 commit 1016676
Show file tree
Hide file tree
Showing 60 changed files with 309 additions and 371 deletions.
62 changes: 0 additions & 62 deletions eng/pipelines/common/checkout-job.yml

This file was deleted.

12 changes: 0 additions & 12 deletions eng/pipelines/common/clone-checkout-bundle-step.yml

This file was deleted.

83 changes: 83 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Template to evaluate common paths in different pipelines.
parameters:
extraSubsets: ''

jobs:
- template: /eng/pipelines/common/evaluate-paths-job.yml
parameters:
paths:
- subset: coreclr
include:
- src/libraries/System.Private.CoreLib/*
- src/libraries/Native/Unix/System.Globalization.Native/*
- src/libraries/Native/Unix/Common/*
exclude:
- eng/Version.Details.xml
- '*.md'
- LICENSE.TXT
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT
- docs/*
- src/installer/*
- src/mono/*
- src/libraries/*
- eng/pipelines/installer/*
- eng/pipelines/mono/*
- eng/pipelines/libraries/*
- subset: mono
include:
- src/libraries/System.Private.CoreLib/*
- src/libraries/Native/Unix/System.Globalization.Native/*
- src/libraries/Native/Unix/Common/*
exclude:
- eng/Version.Details.xml
- '*.md'
- LICENSE.TXT
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT
- docs/*
- src/installer/*
- src/coreclr/*
- src/libraries/*
- eng/pipelines/installer/*
- eng/pipelines/coreclr/*
- eng/pipelines/libraries/*
- subset: libraries
exclude:
- eng/Version.Details.xml
- '*.md'
- LICENSE.TXT
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT
- docs/*
- src/installer/*
- src/mono/*
- src/coreclr/*
- eng/pipelines/coreclr/*
- eng/pipelines/mono/*
- eng/pipelines/installer/*
- subset: runtimetests
include:
- src/tests/*
- src/coreclr/tests/*
- src/coreclr/build-test.cmd
- src/coreclr/build-test.sh
- subset: installer
include:
- docs/manpages/*
exclude:
- eng/Version.Details.xml
- '*.md'
- LICENSE.TXT
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT
- docs/*
- src/coreclr/*
- src/mono/*
- src/libraries/*
- eng/pipelines/coreclr/*
- eng/pipelines/mono/*
- eng/pipelines/libraries/*

- ${{ if ne(parameters.extraSubsets, '') }}:
- ${{ parameters.extraSubsets }}
52 changes: 52 additions & 0 deletions eng/pipelines/common/evaluate-paths-job.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
### Job used to evaluate changed paths on a pull request to emit variables to condition jobs based on paths.

parameters:
# Object containing subset include and exclude paths in an array form.
# Scenarios:
# 1. exclude paths are specified
# Will include all paths except the ones in the exclude list.
# 2. include paths are specified
# Will only include paths specified in the list.
# 3. exclude + include:
# 1st we evaluate changes for all paths except ones in excluded list. If we can't find
# any applicable changes like that, then we evaluate changes for incldued paths
# if any of these two finds changes, then a variable will be set to true.
# In order to consume this variable you need to reference it via: $[ dependencies.evaluate_paths.outputs['SetPathVars_<subset>.containschange'] ]
#
# Array form example
# paths:
# - subset: coreclr
# include:
# - src/libraries/System.Private.CoreLib/*
# exclude:
# - src/libraries/*
#
# This example will include ALL path changes under src/libraries/ except the ones under src/libraries/*!System.Private.CoreLib/*
paths: []


jobs:
- job: evaluate_paths
displayName: Evaluate Paths
pool:
vmImage: 'macOS-10.15'

steps:
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)

- ${{ if ne(parameters.paths[0], '') }}:
- ${{ each path in parameters.paths }}:
- template: evaluate-changed-paths.yml
parameters:
subsetName: ${{ path.subset }}
arguments:
# The commit that we're building is always a merge commit that is merging into the target branch.
# So the first parent of the commit is on the target branch and the second parent is on the source branch.
- --difftarget HEAD^1
- --subset ${{ path.subset }}
- ${{ if ne(path.include[0], '') }}:
- --includepaths '${{ join('+', path.include) }}'
- ${{ if ne(path.exclude[0], '') }}:
- --excludepaths '${{ join('+', path.exclude) }}'
9 changes: 7 additions & 2 deletions eng/pipelines/common/global-build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ parameters:
timeoutInMinutes: ''
pool: ''
condition: true
dependsOnEvaluatePaths: false
isOfficialBuild: false
runtimeFlavor: 'coreclr'
helixQueues: ''
Expand All @@ -22,14 +23,16 @@ jobs:
parameters:
name: ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.nameSuffix) }}
displayName: ${{ format('Build {0}{1} {2} {3} {4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.nameSuffix) }}
dependsOn: checkout
pool: ${{ parameters.pool }}
container: ${{ parameters.container }}
condition: and(succeeded(), ${{ parameters.condition }})
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
workspace:
clean: all

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

variables:
- name: _osParameter
value: -os ${{ parameters.osGroup }}
Expand Down Expand Up @@ -61,7 +64,9 @@ jobs:
- ${{ variable }}

steps:
- template: /eng/pipelines/common/clone-checkout-bundle-step.yml
- checkout: self
clean: true
fetchDepth: $(checkoutFetchDepth)

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/build-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ parameters:
runtimeFlavorDisplayName: 'CoreCLR'
runtimeVariant: ''
dependsOn: []
dependOnEvaluatePaths: false

### Build managed test components (native components are getting built as part
### of the the product build job).
Expand All @@ -47,6 +48,7 @@ jobs:
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
variables: ${{ parameters.variables }}
pool: ${{ parameters.pool }}
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

# Test jobs should continue on error for internal builds
${{ if eq(variables['System.TeamProject'], 'internal') }}:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ parameters:
runtimeFlavor: 'coreclr'
runtimeFlavorDisplayName: 'CoreCLR'
dependsOn: []
dependOnEvaluatePaths: false

### Test run job

Expand All @@ -43,6 +44,7 @@ jobs:
runtimeVariant: ${{ parameters.runtimeVariant }}
pool: ${{ parameters.pool }}
condition: ${{ parameters.condition }}
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}

# Test jobs should continue on error for internal builds
${{ if eq(variables['System.TeamProject'], 'internal') }}:
Expand Down
7 changes: 6 additions & 1 deletion eng/pipelines/common/variables.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
variables:
- name: isOfficialBuild
value: ${{ and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}
value: ${{ and(eq(variables['System.TeamProject'], 'internal'), eq(variables['Build.DefinitionName'], 'dotnet-runtime-official')) }}
- name: isFullMatrix
value: true

# We only run evaluate paths on runtime and runtime-staging pipelines on PRs
- name: dependOnEvaluatePaths
value: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging')) }}

- name: debugOnPrReleaseOnRolling
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
value: Release
Expand Down
9 changes: 7 additions & 2 deletions eng/pipelines/common/xplat-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ jobs:
runtimeFlavorDisplayName: 'CoreCLR'
${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
runtimeFlavorDisplayName: 'Mono'
# keep in sync with /eng/pipelines/common/variables.yml
dependOnEvaluatePaths: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging')) }}
variables:
# Disable component governance in our CI builds. These builds are not shipping nor
# are they a service. Also the component governance jobs issue lots of inconsequential
# warnings and errors into our build timelines that make it hard to track down
# warnings and errors into our build timelines that make it hard to track down
# real errors in the build
- name: skipComponentGovernanceDetection
value: true
Expand All @@ -31,6 +33,9 @@ jobs:
- name: System.DisableZipDownload
value: true

- name: checkoutFetchDepth
value: 20

- name: buildConfigUpper
${{ if eq(parameters.jobParameters.buildConfig, 'debug') }}:
value: 'Debug'
Expand Down Expand Up @@ -85,7 +90,7 @@ jobs:
value: Mono
${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
value: CoreCLR

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

Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/coreclr/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ trigger:
pr: none

jobs:
#
# Checkout repository
#
- template: /eng/pipelines/common/checkout-job.yml


#
# Debug builds
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/coreclr/clrinterpreter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ schedules:
always: true

jobs:
#
# Checkout repository
#
- template: /eng/pipelines/common/checkout-job.yml


- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/coreclr/crossgen2-composite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ schedules:
always: true

jobs:
#
# Checkout repository
#
- template: /eng/pipelines/common/checkout-job.yml


- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/coreclr/crossgen2-gcstress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ schedules:
always: true

jobs:
#
# Checkout repository
#
- template: /eng/pipelines/common/checkout-job.yml


- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/coreclr/crossgen2-outerloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ schedules:
always: true

jobs:
#
# Checkout repository
#
- template: /eng/pipelines/common/checkout-job.yml


- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
Loading

0 comments on commit 1016676

Please sign in to comment.