From 08a82d9351b65328775995fa6c39868ca83bf017 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 15 Dec 2020 17:21:34 -0800 Subject: [PATCH 1/8] Remove checkout bundle and job to improve reliability --- .../common/clone-checkout-bundle-step.yml | 12 ------- ...e-paths.yml => evaluate-default-paths.yml} | 3 +- ...heckout-job.yml => evaluate-paths-job.yml} | 35 +++++++------------ eng/pipelines/common/global-build-job.yml | 7 ++-- eng/pipelines/common/variables.yml | 4 +++ eng/pipelines/coreclr/ci.yml | 5 --- eng/pipelines/coreclr/clrinterpreter.yml | 4 --- eng/pipelines/coreclr/crossgen2-composite.yml | 4 --- eng/pipelines/coreclr/crossgen2-gcstress.yml | 4 --- eng/pipelines/coreclr/crossgen2-outerloop.yml | 4 --- eng/pipelines/coreclr/crossgen2.yml | 4 --- eng/pipelines/coreclr/gc-longrunning.yml | 4 --- eng/pipelines/coreclr/gc-simulator.yml | 4 --- eng/pipelines/coreclr/gcstress-extra.yml | 4 --- .../coreclr/gcstress0x3-gcstress0xc.yml | 4 --- eng/pipelines/coreclr/ilasm.yml | 4 --- eng/pipelines/coreclr/jit-experimental.yml | 4 --- eng/pipelines/coreclr/jitrollingbuild.yml | 4 --- eng/pipelines/coreclr/jitstress-isas-arm.yml | 4 --- eng/pipelines/coreclr/jitstress-isas-x86.yml | 4 --- eng/pipelines/coreclr/jitstress.yml | 4 --- .../coreclr/jitstress2-jitstressregs.yml | 4 --- eng/pipelines/coreclr/jitstressregs-x86.yml | 4 --- eng/pipelines/coreclr/jitstressregs.yml | 4 --- .../coreclr/libraries-gcstress-extra.yml | 4 --- .../libraries-gcstress0x3-gcstress0xc.yml | 4 --- eng/pipelines/coreclr/libraries-jitstress.yml | 4 --- .../libraries-jitstress2-jitstressregs.yml | 4 --- .../coreclr/libraries-jitstressregs.yml | 4 --- eng/pipelines/coreclr/perf.yml | 4 --- eng/pipelines/coreclr/r2r-extra.yml | 4 --- eng/pipelines/coreclr/r2r.yml | 4 --- eng/pipelines/coreclr/release-tests.yml | 4 --- eng/pipelines/coreclr/runincontext.yml | 4 --- eng/pipelines/coreclr/superpmi.yml | 5 --- eng/pipelines/coreclr/templates/xplat-job.yml | 8 ++--- eng/pipelines/global-build.yml | 5 --- eng/pipelines/installer/jobs/base-job.yml | 6 ++-- eng/pipelines/libraries/base-job.yml | 6 ++-- eng/pipelines/libraries/outerloop-mono.yml | 1 - eng/pipelines/libraries/outerloop.yml | 1 - eng/pipelines/mono/templates/xplat-job.yml | 7 ++-- .../jobs/prepare-signed-artifacts.yml | 3 +- eng/pipelines/runtime-linker-tests.yml | 5 --- eng/pipelines/runtime-official.yml | 4 --- eng/pipelines/runtime-staging.yml | 4 +-- eng/pipelines/runtime.yml | 4 +-- eng/pipelines/runtimelab.yml | 4 --- 48 files changed, 45 insertions(+), 196 deletions(-) delete mode 100644 eng/pipelines/common/clone-checkout-bundle-step.yml rename eng/pipelines/common/{checkout-and-evaluate-paths.yml => evaluate-default-paths.yml} (97%) rename eng/pipelines/common/{checkout-job.yml => evaluate-paths-job.yml} (63%) diff --git a/eng/pipelines/common/clone-checkout-bundle-step.yml b/eng/pipelines/common/clone-checkout-bundle-step.yml deleted file mode 100644 index 41ac16e4835398..00000000000000 --- a/eng/pipelines/common/clone-checkout-bundle-step.yml +++ /dev/null @@ -1,12 +0,0 @@ -steps: -- checkout: none - -- download: current - artifact: Checkout_bundle - displayName: Download Checkout.bundle - -- script: | - $(setScriptToEchoAndFailOnNonZero) - git clone $(Pipeline.Workspace)/Checkout_bundle/Checkout.bundle . - git remote set-url origin $(Build.Repository.Uri) - displayName: Clone the repository from Checkout.bundle diff --git a/eng/pipelines/common/checkout-and-evaluate-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml similarity index 97% rename from eng/pipelines/common/checkout-and-evaluate-paths.yml rename to eng/pipelines/common/evaluate-default-paths.yml index 455645b49378c1..c7288f7648d041 100644 --- a/eng/pipelines/common/checkout-and-evaluate-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -1,8 +1,9 @@ parameters: extraSubsets: '' + jobs: -- template: /eng/pipelines/common/checkout-job.yml +- template: /eng/pipelines/common/evaluate-paths-job.yml parameters: paths: - subset: coreclr diff --git a/eng/pipelines/common/checkout-job.yml b/eng/pipelines/common/evaluate-paths-job.yml similarity index 63% rename from eng/pipelines/common/checkout-job.yml rename to eng/pipelines/common/evaluate-paths-job.yml index 9d7f4272d667cd..74cb46fbf51a84 100644 --- a/eng/pipelines/common/checkout-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -1,7 +1,4 @@ -### Check out job creating a git bundle and publishing it -### into an Azure artifact for reuse by the subsequent build and test execution phases. -### If paths is specified, we will create a job using evaluate-changed-paths.yml template -### for each path specified. +### 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. @@ -24,30 +21,22 @@ parameters: # exclude: # - src/libraries/* # - # This example will include ALL path changes except the ones under src/libraries/*!System.Private.CoreLib/* + # This example will include ALL path changes under src/libraries/ except the ones under src/libraries/*!System.Private.CoreLib/* paths: [] -jobs: -- job: checkout - displayName: Checkout - - pool: - vmImage: 'macOS-10.14' - steps: - - checkout: self - clean: true - fetchDepth: 20 - - - script: git bundle create $(Build.StagingDirectory)/Checkout.bundle HEAD - displayName: Create Checkout.bundle +jobs: +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - job: evaluate-paths + displayName: Evaluate Paths + pool: + vmImage: 'macOS-10.14' - - publish: $(Build.StagingDirectory)/Checkout.bundle - artifact: Checkout_bundle - displayName: Upload Checkout.bundle + steps: + - checkout: self + clean: true - - ${{ if and(ne(parameters.paths[0], ''), eq(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ each path in parameters.paths }}: + - ${{ if ne(parameters.paths[0], '') }}: - template: evaluate-changed-paths.yml parameters: subsetName: ${{ path.subset }} diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index efdd1e83addb36..53ab21a3683d1a 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -26,7 +26,6 @@ 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 }}) @@ -34,6 +33,9 @@ jobs: workspace: clean: all + ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + dependsOn: evaluate-paths + variables: - name: _osParameter value: -os ${{ parameters.osGroup }} @@ -66,7 +68,8 @@ jobs: - ${{ variable }} steps: - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml + - checkout: self + clean: true - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 188eeeb6ad74a6..760543475a7519 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -3,6 +3,10 @@ variables: value: ${{ and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }} - name: isFullMatrix value: ${{ and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }} + +# 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 diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index ea79101e9b43dd..dae6c1991f4ea7 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -26,11 +26,6 @@ trigger: jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - # # Debug builds # diff --git a/eng/pipelines/coreclr/clrinterpreter.yml b/eng/pipelines/coreclr/clrinterpreter.yml index 9a86c65885a0dc..afd30afeb6b41a 100644 --- a/eng/pipelines/coreclr/clrinterpreter.yml +++ b/eng/pipelines/coreclr/clrinterpreter.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index 7e60b582eade78..8c8a734c230f36 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-gcstress.yml b/eng/pipelines/coreclr/crossgen2-gcstress.yml index b0eccd168ca632..91fd57df331bc7 100644 --- a/eng/pipelines/coreclr/crossgen2-gcstress.yml +++ b/eng/pipelines/coreclr/crossgen2-gcstress.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index e7f7d12b4bafa4..bbee75f5fb6504 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index 01c84fa43b41db..e6899918318ca5 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index 7f1d2c7d2e47bf..354d0478469f7f 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index d329cbf8980566..ed48e1c6288687 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index 49bdf82dd71840..a80132fae4dcb1 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index 7f5def929d1d79..ac69b525850ade 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml index d7554c288bd91b..1aa2757c1e9a2b 100644 --- a/eng/pipelines/coreclr/ilasm.yml +++ b/eng/pipelines/coreclr/ilasm.yml @@ -18,10 +18,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index f4bd8a36dce2a3..eb209a1643260e 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitrollingbuild.yml b/eng/pipelines/coreclr/jitrollingbuild.yml index d835a05c6f45fe..cd2a0b44f67ca5 100644 --- a/eng/pipelines/coreclr/jitrollingbuild.yml +++ b/eng/pipelines/coreclr/jitrollingbuild.yml @@ -12,10 +12,6 @@ trigger: pr: none jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index d092dbff615e26..260ec5e2b218be 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index c1fd897aef23d0..87d3c1e5a60cbe 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index 1d61c1e66b8719..b8df154ba0e910 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -15,10 +15,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index dba445ae78209e..5a3933e6218f59 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index a93f65b8b28b64..83294c63c95eab 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index a31c08a73e374a..18622bde4d5ebc 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index 183da10c715e11..d9aebfe3080d00 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -10,10 +10,6 @@ trigger: none # always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR checked and libraries Release diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index c4c55dc8d83a29..9493a385d854b0 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -10,10 +10,6 @@ trigger: none # always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR checked and libraries Release diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index 70011295192e17..0d014d1d8c65c6 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -15,10 +15,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR checked and libraries Release diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index 0b9aa538124ce5..17227645c74c7f 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR checked and libraries Release diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index 3199797a099b1c..5718686cc48c7f 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR checked and libraries Release diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index f9b0f537e21916..4105220bcd1542 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -20,10 +20,6 @@ trigger: - THIRD-PARTY-NOTICES.TXT jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # build coreclr and libraries - template: /eng/pipelines/common/platform-matrix.yml diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 68bef96eeb5259..2dfb7f7cef5830 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index e8bde2dd259cee..a4773d15054097 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index 3e47d871361211..d791c652d2b343 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml # # Release CoreCLR and Library builds diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index 037dad2a3f16d1..8fbbe6cc522127 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -9,10 +9,6 @@ schedules: always: true jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/superpmi.yml b/eng/pipelines/coreclr/superpmi.yml index a3baabaf5d2c30..4ead4f9009405a 100644 --- a/eng/pipelines/coreclr/superpmi.yml +++ b/eng/pipelines/coreclr/superpmi.yml @@ -24,11 +24,6 @@ schedules: always: true jobs: -# -# Checkout repository -# - -- template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index 7a2a0cd7ca84fb..a4f086e9648953 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -32,8 +32,8 @@ jobs: container: ${{ parameters.container }} condition: ${{ parameters.condition }} dependsOn: - - ${{ if ne(parameters.stagedBuild, true) }}: - - checkout + - ${{ if and(ne(parameters.stagedBuild, true), eq(variables.dependOnEvaluatePaths, true)) }}: + - evaluate-paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} @@ -102,6 +102,6 @@ jobs: - ${{insert}}: ${{ variable }} steps: - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml - + - checkout: self + clean: true - ${{ parameters.steps }} diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 0f3f3e64f64657..73f42cb3579070 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -29,11 +29,6 @@ pr: - THIRD-PARTY-NOTICES.TXT jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - # # Build with Release config and Debug runtimeConfiguration # diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index b61a869bd718d1..6803b4f9d61feb 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -294,7 +294,8 @@ jobs: value: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}' dependsOn: - - checkout + - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - evaluate-paths - ${{ parameters.dependsOn }} - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', @@ -346,7 +347,8 @@ jobs: continueOnError: false condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml + - checkout: self + clean: true - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 38c08558e9776a..3b83bf7584e35f 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -117,7 +117,8 @@ jobs: - _BuildConfig: ${{ parameters.buildConfig }} dependsOn: - - checkout + - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - evaluate-paths - ${{ parameters.dependsOn }} workspace: clean: all @@ -126,7 +127,8 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} steps: - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml + - checkout: self + clean: true - ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml index 6a893e4fee663f..2dc1e513a850ad 100644 --- a/eng/pipelines/libraries/outerloop-mono.yml +++ b/eng/pipelines/libraries/outerloop-mono.yml @@ -13,7 +13,6 @@ variables: - template: variables.yml jobs: - - template: /eng/pipelines/common/checkout-job.yml - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 62ed9459c9d34d..0a643a6bb714b6 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -12,7 +12,6 @@ variables: - template: variables.yml jobs: - - template: /eng/pipelines/common/checkout-job.yml # # CoreCLR Build diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index 58366dde638b0f..efbccd4507a0b4 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -31,7 +31,8 @@ jobs: container: ${{ parameters.container }} condition: ${{ parameters.condition }} dependsOn: - - checkout + - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - evaluate-paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} @@ -94,6 +95,6 @@ jobs: - ${{insert}}: ${{ variable }} steps: - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml - + - checkout: self + clean: true - ${{ parameters.steps }} diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 2a1a11339633da..3aa4b74c942f07 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -21,7 +21,8 @@ jobs: value: $[ coalesce(variables.OfficialSignType, 'real') ] steps: - - template: /eng/pipelines/common/clone-checkout-bundle-step.yml + - checkout: self + clean: true - ${{ if eq(parameters.isOfficialBuild, true) }}: - task: NuGetAuthenticate@0 diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index b78db5fca3fccf..729cb177847a70 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -46,11 +46,6 @@ pr: - THIRD-PARTY-NOTICES.TXT jobs: -# -# Checkout repository -# -- template: /eng/pipelines/common/checkout-job.yml - # # Build Release config vertical for Windows, Linux, Linux musl and OSX # diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 6cde390c289cea..0c07ccf7a2f0bd 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -40,10 +40,6 @@ variables: stages: - stage: Build jobs: - # - # Checkout repository - # - - template: /eng/pipelines/common/checkout-job.yml # # Build CoreCLR diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 2dfeef72a37551..81a5a46f5e3597 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -50,9 +50,9 @@ variables: jobs: # -# Checkout repository and evaluate paths +# Evaluate paths # -- template: /eng/pipelines/common/checkout-and-evaluate-paths.yml +- template: /eng/pipelines/common/evaluate-default-paths.yml # # Build the whole product using Mono and run libraries tests diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 83b9451ef80843..df95741f4b97cb 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -52,9 +52,9 @@ variables: jobs: # -# Checkout repository and evaluate paths +# Evaluate paths # -- template: /eng/pipelines/common/checkout-and-evaluate-paths.yml +- template: /eng/pipelines/common/evaluate-default-paths.yml # # Build CoreCLR checked diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index facd5bc264aedf..aa8ba4488b9236 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -52,10 +52,6 @@ variables: stages: - stage: Build jobs: - # - # Checkout repository - # - - template: /eng/pipelines/common/checkout-job.yml # # Build with Debug config and Checked runtimeConfiguration From 63a9d09e880c673a4819f71590440aae8cd15bea Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 15 Dec 2020 18:12:08 -0800 Subject: [PATCH 2/8] comment --- eng/pipelines/common/evaluate-default-paths.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index c7288f7648d041..9f9adf4be8bde0 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -1,3 +1,4 @@ +# Template to evaluate common paths in different pipelines. parameters: extraSubsets: '' From c72689c5941bfc58cad16d4d0cb24fef8c618acd Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 15 Dec 2020 18:25:47 -0800 Subject: [PATCH 3/8] Fix build error --- eng/pipelines/common/evaluate-paths-job.yml | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index 74cb46fbf51a84..5909c1e8c593f5 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -37,15 +37,16 @@ jobs: clean: true - ${{ if ne(parameters.paths[0], '') }}: - - 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) }}' + - ${{ 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) }}' From dd52781efb57cd73ca77511cdbca416ec70c6976 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 15 Dec 2020 18:30:06 -0800 Subject: [PATCH 4/8] Rename evaluate paths job to a valid name --- eng/pipelines/common/evaluate-default-paths.yml | 1 - eng/pipelines/common/evaluate-paths-job.yml | 2 +- eng/pipelines/common/global-build-job.yml | 2 +- eng/pipelines/coreclr/templates/xplat-job.yml | 2 +- eng/pipelines/installer/jobs/base-job.yml | 2 +- eng/pipelines/libraries/base-job.yml | 2 +- eng/pipelines/mono/templates/xplat-job.yml | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 9f9adf4be8bde0..389562d859f495 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -2,7 +2,6 @@ parameters: extraSubsets: '' - jobs: - template: /eng/pipelines/common/evaluate-paths-job.yml parameters: diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index 5909c1e8c593f5..e33de1d161086e 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -27,7 +27,7 @@ parameters: jobs: - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - job: evaluate-paths + - job: evaluate_paths displayName: Evaluate Paths pool: vmImage: 'macOS-10.14' diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 53ab21a3683d1a..538576fbf90f78 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -34,7 +34,7 @@ jobs: clean: all ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - dependsOn: evaluate-paths + dependsOn: evaluate_paths variables: - name: _osParameter diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index a4f086e9648953..4847ed6c8a7f84 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -33,7 +33,7 @@ jobs: condition: ${{ parameters.condition }} dependsOn: - ${{ if and(ne(parameters.stagedBuild, true), eq(variables.dependOnEvaluatePaths, true)) }}: - - evaluate-paths + - evaluate_paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 6803b4f9d61feb..0685b14177f620 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -295,7 +295,7 @@ jobs: dependsOn: - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - - evaluate-paths + - evaluate_paths - ${{ parameters.dependsOn }} - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 3b83bf7584e35f..162ca574287b78 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -118,7 +118,7 @@ jobs: dependsOn: - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - - evaluate-paths + - evaluate_paths - ${{ parameters.dependsOn }} workspace: clean: all diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index efbccd4507a0b4..fbdf87e5f667ac 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -32,7 +32,7 @@ jobs: condition: ${{ parameters.condition }} dependsOn: - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: - - evaluate-paths + - evaluate_paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} From 610050aae737bf2f22c0e02ad19775fadca30411 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 15 Dec 2020 18:38:33 -0800 Subject: [PATCH 5/8] Fix references to evaluate path variables --- eng/pipelines/common/evaluate-paths-job.yml | 2 +- eng/pipelines/runtime-staging.yml | 14 +- eng/pipelines/runtime.yml | 146 ++++++++++---------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index e33de1d161086e..9f965d51ffece0 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -11,7 +11,7 @@ parameters: # 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.checkout.outputs['SetPathVars_.containschange'] ] + # In order to consume this variable you need to reference it via: $[ dependencies.evaluate_paths.outputs['SetPathVars_.containschange'] ] # # Array form example # paths: diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 81a5a46f5e3597..14a9b517dcaa12 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -69,9 +69,9 @@ jobs: variables: # map dependencies variables to local variables - name: librariesContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_libraries.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -79,9 +79,9 @@ jobs: timeoutInMinutes: 120 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -124,8 +124,8 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index df95741f4b97cb..6128ef88c56b5e 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -80,8 +80,8 @@ jobs: testGroup: innerloop condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -99,7 +99,7 @@ jobs: compilerName: gcc condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -116,9 +116,9 @@ jobs: testGroup: innerloop condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -165,7 +165,7 @@ jobs: eq(variables['Build.SourceBranchName'], 'master'), eq(variables['System.PullRequest.TargetBranch'], 'master')), or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true))) # Build and test clr tools @@ -179,7 +179,7 @@ jobs: testGroup: clrTools condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) # Build the whole product using Mono runtime @@ -202,9 +202,9 @@ jobs: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -223,9 +223,9 @@ jobs: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -242,9 +242,9 @@ jobs: variables: # map dependencies variables to local variables - name: librariesContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_libraries.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -252,9 +252,9 @@ jobs: timeoutInMinutes: 120 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -286,9 +286,9 @@ jobs: variables: # map dependencies variables to local variables - name: librariesContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_libraries.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - name: monoContainsChange - value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ] + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -296,9 +296,9 @@ jobs: timeoutInMinutes: 180 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml @@ -340,8 +340,8 @@ jobs: timeoutInMinutes: 180 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml @@ -366,9 +366,9 @@ jobs: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -386,9 +386,9 @@ jobs: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -409,9 +409,9 @@ jobs: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -428,9 +428,9 @@ jobs: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -454,8 +454,8 @@ jobs: jobParameters: condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -477,8 +477,8 @@ jobs: jobParameters: condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -496,9 +496,9 @@ jobs: jobParameters: condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -517,8 +517,8 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -575,7 +575,7 @@ jobs: liveRuntimeBuildConfig: release condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -594,7 +594,7 @@ jobs: testScope: innerloop condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -610,7 +610,7 @@ jobs: runTests: true condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -663,7 +663,7 @@ jobs: liveLibrariesBuildConfig: Release condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -681,8 +681,8 @@ jobs: liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -704,8 +704,8 @@ jobs: liveLibrariesBuildConfig: Release condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -724,8 +724,8 @@ jobs: liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -744,8 +744,8 @@ jobs: liveRuntimeBuildConfig: release condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -767,8 +767,8 @@ jobs: liveRuntimeBuildConfig: release condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # # Mono CoreCLR runtime Test executions using live libraries and LLVM AOT @@ -791,8 +791,8 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -820,8 +820,8 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -849,8 +849,8 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -875,7 +875,7 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -905,7 +905,7 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -931,7 +931,7 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -951,7 +951,7 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -973,6 +973,6 @@ jobs: dependsOnTestArchitecture: x64 condition: >- or( - eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(variables['isFullMatrix'], true)) From bbf318fbb35fc728dfa52175eba975793ca7fed7 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 16 Dec 2020 11:53:11 -0800 Subject: [PATCH 6/8] Condition evaluate paths dependency on common parameter --- eng/pipelines/common/global-build-job.yml | 3 ++- eng/pipelines/common/templates/runtimes/build-test-job.yml | 2 ++ eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 ++ eng/pipelines/common/xplat-setup.yml | 1 + eng/pipelines/coreclr/templates/build-jit-job.yml | 2 ++ eng/pipelines/coreclr/templates/build-job.yml | 2 ++ eng/pipelines/coreclr/templates/crossdac-pack.yml | 2 ++ eng/pipelines/coreclr/templates/crossgen-comparison-job.yml | 2 ++ .../coreclr/templates/crossgen2-comparison-build-job.yml | 2 ++ eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml | 2 ++ eng/pipelines/coreclr/templates/format-job.yml | 2 ++ eng/pipelines/coreclr/templates/helix-queues-setup.yml | 2 ++ eng/pipelines/coreclr/templates/run-superpmi-job.yml | 2 ++ eng/pipelines/coreclr/templates/xplat-job.yml | 3 ++- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 2 ++ eng/pipelines/installer/jobs/base-job.yml | 3 ++- eng/pipelines/libraries/base-job.yml | 3 ++- eng/pipelines/libraries/build-job.yml | 2 ++ eng/pipelines/libraries/helix-queues-setup.yml | 2 ++ eng/pipelines/libraries/run-test-job.yml | 2 ++ eng/pipelines/mono/templates/build-job.yml | 2 ++ eng/pipelines/mono/templates/xplat-job.yml | 3 ++- eng/pipelines/mono/templates/xplat-pipeline-job.yml | 2 ++ 23 files changed, 45 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 538576fbf90f78..af32dcc44b0430 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -15,6 +15,7 @@ parameters: platform: '' condition: true shouldContinueOnError: false + dependOnEvaluatePaths: false isOfficialBuild: false runtimeFlavor: 'coreclr' helixQueues: '' @@ -33,7 +34,7 @@ jobs: workspace: clean: all - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + ${{ if eq(parameters.dependOnEvaluatePaths, true) }}: dependsOn: evaluate_paths variables: diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 313cb5e7cea373..cb84d3420d52cb 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -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). @@ -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') }}: diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 6d40d18e116ebf..eac13a734eca98 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -23,6 +23,7 @@ parameters: runtimeFlavorDisplayName: 'CoreCLR' shouldContinueOnError: false dependsOn: [] + dependOnEvaluatePaths: false ### Test run job @@ -46,6 +47,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') }}: diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index cf78ddf037c2a0..acace042c88071 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -19,6 +19,7 @@ jobs: runtimeFlavorDisplayName: 'Mono' shouldContinueOnError: ${{ and(endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest')) }} + 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 diff --git a/eng/pipelines/coreclr/templates/build-jit-job.yml b/eng/pipelines/coreclr/templates/build-jit-job.yml index 5cf41315fce3c9..14b364c1ce8a16 100644 --- a/eng/pipelines/coreclr/templates/build-jit-job.yml +++ b/eng/pipelines/coreclr/templates/build-jit-job.yml @@ -10,6 +10,7 @@ parameters: stagedBuild: false timeoutInMinutes: '' variables: {} + dependOnEvaluatePaths: false ### Product build jobs: @@ -23,6 +24,7 @@ jobs: enableMicrobuild: true stagedBuild: ${{ parameters.stagedBuild }} pool: ${{ parameters.pool }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters name: ${{ format('coreclr_jit_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index dae8c8a19177d7..bae0c5fe790daf 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -8,6 +8,7 @@ parameters: container: '' crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false isOfficialBuild: false osGroup: '' osSubgroup: '' @@ -35,6 +36,7 @@ jobs: stagedBuild: ${{ parameters.stagedBuild }} pool: ${{ parameters.pool }} condition: ${{ parameters.condition }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters ${{ if and(ne(parameters.testGroup, 'clrTools'), eq(parameters.compilerName, 'gcc')) }}: diff --git a/eng/pipelines/coreclr/templates/crossdac-pack.yml b/eng/pipelines/coreclr/templates/crossdac-pack.yml index 4309baa3203675..77802a2bf40b34 100644 --- a/eng/pipelines/coreclr/templates/crossdac-pack.yml +++ b/eng/pipelines/coreclr/templates/crossdac-pack.yml @@ -3,6 +3,7 @@ parameters: buildConfig: '' container: '' crossDacPlatforms: {} + dependOnEvaluatePaths: false isOfficialBuild: false osGroup: '' osSubgroup: '' @@ -28,6 +29,7 @@ jobs: runtimeVariant: ${{ parameters.runtimeVariant }} stagedBuild: ${{ parameters.stagedBuild }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} name: crossdacpack displayName: CrossDac Packaging diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml index 5275bb19dd9f30..282dcee588e5d8 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -8,6 +8,7 @@ parameters: runtimeVariant: '' crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false stagedBuild: false variables: {} pool: '' @@ -36,6 +37,7 @@ jobs: liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} helixType: 'test/crossgen-comparison/' pool: ${{ parameters.pool }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters name: ${{ format('test_crossgen_comparison_{0}{1}_{1}_{2}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml index 106ce380475312..1a326c1f295fc8 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml @@ -8,6 +8,7 @@ parameters: runtimeVariant: '' crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false stagedBuild: false variables: {} pool: '' @@ -36,6 +37,7 @@ jobs: liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} helixType: 'test/crossgen-comparison/' pool: ${{ parameters.pool }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters name: ${{ format('test_crossgen2_comparison_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml index ccb447e5ebfc56..8bc7f6f0f6f06b 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml @@ -8,6 +8,7 @@ parameters: runtimeVariant: '' crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false stagedBuild: false variables: {} pool: '' @@ -40,6 +41,7 @@ jobs: pool: ${{ parameters.pool }} targetos: ${{ parameters.targetos }} targetarch: ${{ parameters.targetarch }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters name: ${{ format('test_crossgen2_comparison_{0}{1}_{2}_{3}_{4}_{5}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.targetarch, parameters.targetos) }} diff --git a/eng/pipelines/coreclr/templates/format-job.yml b/eng/pipelines/coreclr/templates/format-job.yml index 5699ccb1d3d36e..783fdcfcfef5a5 100644 --- a/eng/pipelines/coreclr/templates/format-job.yml +++ b/eng/pipelines/coreclr/templates/format-job.yml @@ -6,6 +6,7 @@ parameters: container: '' crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false timeoutInMinutes: '' stagedBuild: false variables: {} @@ -23,6 +24,7 @@ jobs: container: ${{ parameters.container }} crossBuild: ${{ parameters.crossBuild }} crossrootfsDir: ${{ parameters.crossrootfsDir }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} stagedBuild: ${{ parameters.stagedBuild }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} name: ${{ format('format_{0}{1}_{2}', parameters.osGroup, parameters.osSubgroup, parameters.archType) }} diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index a50ecff918a748..5d75da53e52cac 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -9,6 +9,7 @@ parameters: platform: '' runtimeFlavorDisplayName: '' shouldContinueOnError: false + dependOnEvaluatePaths: false jobParameters: {} jobs: @@ -21,6 +22,7 @@ jobs: container: ${{ parameters.container }} pool: ${{ parameters.pool }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}} runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} helixQueues: diff --git a/eng/pipelines/coreclr/templates/run-superpmi-job.yml b/eng/pipelines/coreclr/templates/run-superpmi-job.yml index 64c3239b0587ad..30eb295fc119e3 100644 --- a/eng/pipelines/coreclr/templates/run-superpmi-job.yml +++ b/eng/pipelines/coreclr/templates/run-superpmi-job.yml @@ -22,6 +22,7 @@ parameters: runKind: '' # required -- test category collectionType: '' collectionName: '' + dependOnEvaluatePaths: false jobs: - template: xplat-pipeline-job.yml @@ -37,6 +38,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} collectionType: $ {{ parameters.collectionType }} collectionName: ${{ parameters.collectionName }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} ${{ if ne(parameters.displayName, '') }}: displayName: '${{ parameters.displayName }}' diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index 4847ed6c8a7f84..08a77acf918845 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -16,6 +16,7 @@ parameters: condition: '' continueOnError: false dependsOn: '' + dependOnEvaluatePaths: false displayName: '' timeoutInMinutes: '' enableMicrobuild: '' @@ -32,7 +33,7 @@ jobs: container: ${{ parameters.container }} condition: ${{ parameters.condition }} dependsOn: - - ${{ if and(ne(parameters.stagedBuild, true), eq(variables.dependOnEvaluatePaths, true)) }}: + - ${{ if eq(parameters.dependOnEvaluatePaths, true) }}: - evaluate_paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 00ae63eb25bd21..93c8ed0f8cf4c0 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -18,6 +18,7 @@ parameters: condition: true continueOnError: false dependsOn: '' + dependOnEvaluatePaths: false displayName: '' timeoutInMinutes: '' enableMicrobuild: '' @@ -45,6 +46,7 @@ jobs: condition: and(succeeded(), ${{ parameters.condition }}) continueOnError: ${{ parameters.continueOnError }} dependsOn: ${{ parameters.dependsOn }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} displayName: ${{ parameters.displayName }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} enableMicrobuild: ${{ parameters.enableMicrobuild }} diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 0685b14177f620..63cb8b3c902ff6 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -13,6 +13,7 @@ parameters: buildSteps: [] dependsOn: [] dependsOnGlobalBuild: false + dependOnEvaluatePaths: false globalBuildSuffix: '' variables: [] name: '' @@ -294,7 +295,7 @@ jobs: value: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}' dependsOn: - - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - ${{ if eq(parameters.dependOnEvaluatePaths, true) }}: - evaluate_paths - ${{ parameters.dependsOn }} - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 162ca574287b78..8fcf6dd1244114 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -15,6 +15,7 @@ parameters: container: '' steps: [] dependsOn: [] + dependOnEvaluatePaths: false variables: {} name: '' displayName: '' @@ -117,7 +118,7 @@ jobs: - _BuildConfig: ${{ parameters.buildConfig }} dependsOn: - - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - ${{ if eq(parameters.dependOnEvaluatePaths, true) }}: - evaluate_paths - ${{ parameters.dependsOn }} workspace: diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index d54cbb1298bafe..9d26ad7a4af067 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -24,6 +24,7 @@ parameters: preBuildSteps: [] container: '' condition: true + dependOnEvaluatePaths: false shouldContinueOnError: false variables: {} pool: '' @@ -50,6 +51,7 @@ jobs: preBuildSteps: ${{ parameters.preBuildSteps }} container: ${{ parameters.container }} condition: ${{ parameters.condition }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} pool: ${{ parameters.pool }} runtimeVariant: ${{ parameters.runtimeVariant }} testScope: ${{ parameters.testScope }} diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 49c39a2d949d6d..1b8b1c5e93d370 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -9,6 +9,7 @@ parameters: platform: '' runtimeFlavorDisplayName: '' shouldContinueOnError: false + dependOnEvaluatePaths: false jobParameters: {} jobs: @@ -21,6 +22,7 @@ jobs: container: ${{ parameters.container }} pool: ${{ parameters.pool }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths}} runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }} helixQueues: diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 90140bbd9f48ed..c2335785401c11 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -18,6 +18,7 @@ parameters: dependsOnTestBuildConfiguration: Debug dependsOnTestArchitecture: x64 dependsOnTestOsSubgroup: '' + dependOnEvaluatePaths: false condition: true shouldContinueOnError: false variables: {} @@ -54,6 +55,7 @@ jobs: ${{ if eq(parameters.interpreter, 'true') }}: testDisplayName: ${{ parameters.runtimeFlavor }}_interpreter_${{ parameters.liveRuntimeBuildConfig }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} dependsOn: - ${{ if ne(parameters.dependsOn[0], '') }}: - ${{ parameters.dependsOn }} diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 6b601d83c050b8..d67df2098f2b55 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -13,6 +13,7 @@ parameters: isOfficialBuild: false crossBuild: false crossrootfsDir: '' + dependOnEvaluatePaths: false ### Product build jobs: @@ -29,6 +30,7 @@ jobs: crossBuild: ${{ parameters.crossBuild }} crossrootfsDir: ${{ parameters.crossroofsDir }} condition: ${{ parameters.condition }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} # Compute job name from template parameters name: ${{ format('mono_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index fbdf87e5f667ac..b7a3b9aa294731 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -15,6 +15,7 @@ parameters: condition: '' continueOnError: false dependsOn: '' + dependOnEvaluatePaths: false displayName: '' timeoutInMinutes: '' enableMicrobuild: '' @@ -31,7 +32,7 @@ jobs: container: ${{ parameters.container }} condition: ${{ parameters.condition }} dependsOn: - - ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - ${{ if eq(parameters.dependOnEvaluatePaths, true) }}: - evaluate_paths - ${{ if ne(parameters.dependsOn, '') }}: - ${{ parameters.dependsOn }} diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml index 89917a58e0b8a3..31b61c20f93d11 100644 --- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml @@ -16,6 +16,7 @@ parameters: condition: true continueOnError: false dependsOn: '' + dependOnEvaluatePaths: false displayName: '' timeoutInMinutes: '' enableMicrobuild: '' @@ -41,6 +42,7 @@ jobs: condition: and(succeeded(), ${{ parameters.condition }}) continueOnError: ${{ parameters.continueOnError }} dependsOn: ${{ parameters.dependsOn }} + dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} displayName: ${{ parameters.displayName }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} enableMicrobuild: ${{ parameters.enableMicrobuild }} From 3f08798b5b0abd35e50d146c3d2237c2167561cc Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 16 Dec 2020 12:04:13 -0800 Subject: [PATCH 7/8] Bring back fetch depth to 20 --- eng/pipelines/common/evaluate-paths-job.yml | 1 + eng/pipelines/common/global-build-job.yml | 1 + eng/pipelines/coreclr/templates/xplat-job.yml | 2 ++ eng/pipelines/installer/jobs/base-job.yml | 1 + eng/pipelines/libraries/base-job.yml | 1 + eng/pipelines/mono/templates/xplat-job.yml | 2 ++ eng/pipelines/official/jobs/prepare-signed-artifacts.yml | 1 + 7 files changed, 9 insertions(+) diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index 9f965d51ffece0..31271d5705d159 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -35,6 +35,7 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 - ${{ if ne(parameters.paths[0], '') }}: - ${{ each path in parameters.paths }}: diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index af32dcc44b0430..4e88ce8f889671 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -71,6 +71,7 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index 08a77acf918845..59e893fe1dfd79 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -105,4 +105,6 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 + - ${{ parameters.steps }} diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 63cb8b3c902ff6..eed06c89e83de3 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -350,6 +350,7 @@ jobs: - checkout: self clean: true + fetchDepth: 20 - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 8fcf6dd1244114..2826d0569506c0 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -130,6 +130,7 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 - ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index b7a3b9aa294731..715c809e741c11 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -98,4 +98,6 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 + - ${{ parameters.steps }} diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 3aa4b74c942f07..abab79b6fdcec6 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -23,6 +23,7 @@ jobs: steps: - checkout: self clean: true + fetchDepth: 20 - ${{ if eq(parameters.isOfficialBuild, true) }}: - task: NuGetAuthenticate@0 From d90c836f7c22f80f4fafe6c64f21580856f44579 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Wed, 16 Dec 2020 14:04:17 -0800 Subject: [PATCH 8/8] PR Feedback --- eng/pipelines/common/evaluate-paths-job.yml | 3 +-- eng/pipelines/common/global-build-job.yml | 2 +- eng/pipelines/common/xplat-setup.yml | 5 +++++ eng/pipelines/coreclr/templates/xplat-job.yml | 2 +- eng/pipelines/installer/jobs/base-job.yml | 2 +- eng/pipelines/libraries/base-job.yml | 2 +- eng/pipelines/mono/templates/xplat-job.yml | 2 +- eng/pipelines/runtime-staging.yml | 3 ++- eng/pipelines/runtime.yml | 3 ++- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/common/evaluate-paths-job.yml b/eng/pipelines/common/evaluate-paths-job.yml index 31271d5705d159..58f0e96389b64e 100644 --- a/eng/pipelines/common/evaluate-paths-job.yml +++ b/eng/pipelines/common/evaluate-paths-job.yml @@ -26,7 +26,6 @@ parameters: jobs: -- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - job: evaluate_paths displayName: Evaluate Paths pool: @@ -35,7 +34,7 @@ jobs: steps: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ if ne(parameters.paths[0], '') }}: - ${{ each path in parameters.paths }}: diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 4e88ce8f889671..6a51fa839307e3 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -71,7 +71,7 @@ jobs: steps: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index acace042c88071..c9929621eb17b4 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -19,6 +19,8 @@ jobs: runtimeFlavorDisplayName: 'Mono' shouldContinueOnError: ${{ and(endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest')) }} + + # keep in sync with /eng/pipelines/common/variables.yml dependOnEvaluatePaths: ${{ and(eq(variables['Build.Reason'], 'PullRequest'), in(variables['Build.DefinitionName'], 'runtime', 'runtime-staging')) }} variables: @@ -31,6 +33,9 @@ jobs: - name: runCodesignValidationInjection value: false + - name: checkoutFetchDepth + value: 20 + - name: buildConfigUpper ${{ if eq(parameters.jobParameters.buildConfig, 'debug') }}: value: 'Debug' diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml index 59e893fe1dfd79..471c39bfe951bf 100644 --- a/eng/pipelines/coreclr/templates/xplat-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-job.yml @@ -105,6 +105,6 @@ jobs: steps: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ parameters.steps }} diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index eed06c89e83de3..68e27372087bf7 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -350,7 +350,7 @@ jobs: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 2826d0569506c0..4307af1bc54452 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -130,7 +130,7 @@ jobs: steps: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ if and(ne(parameters.liveRuntimeBuildConfig, ''), eq(parameters.runTests, true)) }}: - template: /eng/pipelines/common/download-artifact-step.yml diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml index 715c809e741c11..3c91c47903b4b9 100644 --- a/eng/pipelines/mono/templates/xplat-job.yml +++ b/eng/pipelines/mono/templates/xplat-job.yml @@ -98,6 +98,6 @@ jobs: steps: - checkout: self clean: true - fetchDepth: 20 + fetchDepth: $(checkoutFetchDepth) - ${{ parameters.steps }} diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 14a9b517dcaa12..87afa0db6bbe02 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -52,7 +52,8 @@ jobs: # # Evaluate paths # -- template: /eng/pipelines/common/evaluate-default-paths.yml +- ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - template: /eng/pipelines/common/evaluate-default-paths.yml # # Build the whole product using Mono and run libraries tests diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 6128ef88c56b5e..6712fa33bd5ae0 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -54,7 +54,8 @@ jobs: # # Evaluate paths # -- template: /eng/pipelines/common/evaluate-default-paths.yml +- ${{ if eq(variables.dependOnEvaluatePaths, true) }}: + - template: /eng/pipelines/common/evaluate-default-paths.yml # # Build CoreCLR checked