From 79ae74f5ca5c8a6fe3a48935e85bd7374959c570 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 1 Mar 2021 09:55:17 +0100 Subject: [PATCH] Add main branch triggers to ymls (#48821) --- eng/pipelines/coreclr/ci.yml | 1 + eng/pipelines/coreclr/clrinterpreter.yml | 1 + eng/pipelines/coreclr/crossgen2-composite.yml | 1 + eng/pipelines/coreclr/crossgen2-gcstress.yml | 1 + eng/pipelines/coreclr/crossgen2-outerloop.yml | 1 + eng/pipelines/coreclr/crossgen2.yml | 1 + eng/pipelines/coreclr/gc-longrunning.yml | 1 + eng/pipelines/coreclr/gc-simulator.yml | 1 + eng/pipelines/coreclr/gcstress-extra.yml | 1 + eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml | 1 + eng/pipelines/coreclr/ilasm.yml | 2 ++ eng/pipelines/coreclr/jit-experimental.yml | 1 + eng/pipelines/coreclr/jitrollingbuild.yml | 1 + eng/pipelines/coreclr/jitstress-isas-arm.yml | 1 + eng/pipelines/coreclr/jitstress-isas-x86.yml | 1 + eng/pipelines/coreclr/jitstress.yml | 1 + eng/pipelines/coreclr/jitstress2-jitstressregs.yml | 1 + eng/pipelines/coreclr/jitstressregs-x86.yml | 1 + eng/pipelines/coreclr/jitstressregs.yml | 1 + eng/pipelines/coreclr/libraries-gcstress-extra.yml | 2 +- .../coreclr/libraries-gcstress0x3-gcstress0xc.yml | 2 +- eng/pipelines/coreclr/libraries-jitstress.yml | 1 + .../coreclr/libraries-jitstress2-jitstressregs.yml | 1 + eng/pipelines/coreclr/libraries-jitstressregs.yml | 1 + eng/pipelines/coreclr/perf.yml | 2 ++ eng/pipelines/coreclr/r2r-extra.yml | 1 + eng/pipelines/coreclr/r2r.yml | 1 + eng/pipelines/coreclr/release-tests.yml | 1 + eng/pipelines/coreclr/runincontext.yml | 1 + eng/pipelines/coreclr/superpmi.yml | 2 ++ eng/pipelines/global-build.yml | 1 + eng/pipelines/libraries/enterprise/linux.yml | 1 + eng/pipelines/libraries/outerloop-mono.yml | 2 +- eng/pipelines/libraries/outerloop.yml | 1 + eng/pipelines/libraries/stress/http.yml | 1 + eng/pipelines/libraries/stress/ssl.yml | 1 + eng/pipelines/runtime-linker-tests.yml | 4 ++-- eng/pipelines/runtime-official.yml | 1 + eng/pipelines/runtime-richnav.yml | 1 + eng/pipelines/runtime-staging.yml | 3 ++- eng/pipelines/runtime.yml | 10 +++++----- 41 files changed, 50 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index dae6c1991f4ea..431c952ffa63d 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - main - release/*.* paths: include: diff --git a/eng/pipelines/coreclr/clrinterpreter.yml b/eng/pipelines/coreclr/clrinterpreter.yml index afd30afeb6b41..27846c95bc8db 100644 --- a/eng/pipelines/coreclr/clrinterpreter.yml +++ b/eng/pipelines/coreclr/clrinterpreter.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index 8c8a734c230f3..b422dd9514559 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/crossgen2-gcstress.yml b/eng/pipelines/coreclr/crossgen2-gcstress.yml index 91fd57df331bc..f6d0c1c75d51b 100644 --- a/eng/pipelines/coreclr/crossgen2-gcstress.yml +++ b/eng/pipelines/coreclr/crossgen2-gcstress.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index bbee75f5fb650..6ea5da1d3da46 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index e6899918318ca..6e6828c8db2dd 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index 354d0478469f7..c7f9b54cf7829 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index ed48e1c628868..e14eb874fbcc0 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index a80132fae4dcb..0f919b3169dd5 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index ac69b525850ad..9179d07ead425 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml index 1aa2757c1e9a2..cc5fa4a20079e 100644 --- a/eng/pipelines/coreclr/ilasm.yml +++ b/eng/pipelines/coreclr/ilasm.yml @@ -4,6 +4,7 @@ pr: branches: include: - master + - main paths: include: - src/coreclr/ilasm/* @@ -15,6 +16,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index eb209a1643260..5f56ac76f648f 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jitrollingbuild.yml b/eng/pipelines/coreclr/jitrollingbuild.yml index 63fc5fc447fc0..1fb0cd5a3a978 100644 --- a/eng/pipelines/coreclr/jitrollingbuild.yml +++ b/eng/pipelines/coreclr/jitrollingbuild.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - main paths: include: - src/coreclr/jit/* diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index 260ec5e2b218b..79f4f146feff5 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index 87d3c1e5a60cb..e091033399bb0 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index b8df154ba0e91..aa8ad0e7ede66 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true - cron: "0 4 * * 0,2,4,6" displayName: Sun, Tue, Thu, Sat at 8:00 PM (UTC-8:00) diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index 5a3933e6218f5..00e0415066b47 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index 83294c63c95ea..9ce1fb5159a3d 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index 18622bde4d5eb..0245e4e23ad9b 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index d9aebfe3080d0..7cf0759a68c7e 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -6,7 +6,7 @@ trigger: none # displayName: Sun at 2:00 AM (UTC-8:00) # branches: # include: -# - master +# - main # always: true jobs: diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index 9493a385d854b..1b146e840f93c 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -6,7 +6,7 @@ trigger: none # displayName: Sat at 2:00 AM (UTC-8:00) # branches: # include: -# - master +# - main # always: true jobs: diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index 0d014d1d8c65c..7b692e3032240 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true - cron: "0 7 * * 1,3,5" displayName: Mon, Wed, Fri at 11:00 PM (UTC-8:00) diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index 17227645c74c7..cfaa3e9eaad9c 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index 5718686cc48c7..5e6305f289236 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index c01589849301e..403f2a1cf5e17 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - main - release/* paths: include: @@ -28,6 +29,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 2dfb7f7cef583..d0decbd02b122 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index a4773d1505409..f76d11c2ba852 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index d791c652d2b34..34a0e462a2d3b 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index 8fbbe6cc52212..2e46f2fc6aa52 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/coreclr/superpmi.yml b/eng/pipelines/coreclr/superpmi.yml index 5927afe2d2873..8de0accb711ca 100644 --- a/eng/pipelines/coreclr/superpmi.yml +++ b/eng/pipelines/coreclr/superpmi.yml @@ -7,6 +7,7 @@ trigger: branches: include: - master + - main paths: include: - src/coreclr/inc/jiteeversionguid.h @@ -21,6 +22,7 @@ schedules: branches: include: - master + - main always: true jobs: diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index 73f42cb357907..7bd982708e97a 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -8,6 +8,7 @@ pr: branches: include: - master + - main - release/*.* paths: include: diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml index caf5d91164ee7..0d4618da506f5 100644 --- a/eng/pipelines/libraries/enterprise/linux.yml +++ b/eng/pipelines/libraries/enterprise/linux.yml @@ -7,6 +7,7 @@ pr: branches: include: - master + - main - release/*.* paths: diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml index 2dc1e513a850a..7dd54bc883955 100644 --- a/eng/pipelines/libraries/outerloop-mono.yml +++ b/eng/pipelines/libraries/outerloop-mono.yml @@ -6,7 +6,7 @@ trigger: none # displayName: Outerloop scheduled build # branches: # include: -# - master +# - main # - release/*.* variables: diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 0a643a6bb714b..dbff63405652f 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -6,6 +6,7 @@ schedules: branches: include: - master + - main - release/*.* variables: diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 429e7b5d2ed0c..006d446f71fc3 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -11,6 +11,7 @@ schedules: branches: include: - master + - main variables: - template: ../variables.yml diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index 5359ea76e8b28..d59055ec5f176 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -11,6 +11,7 @@ schedules: branches: include: - master + - main variables: - template: ../variables.yml diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index af32d469163f7..6c8a9d6678844 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -7,7 +7,7 @@ trigger: branches: include: - master - - dev/infrastructure + - main - release/*.* paths: include: @@ -28,7 +28,7 @@ pr: branches: include: - master - - dev/infrastructure + - main - release/*.* paths: include: diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index dfc4289357734..fa201f503bf73 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - main - release/* - internal/release/* paths: diff --git a/eng/pipelines/runtime-richnav.yml b/eng/pipelines/runtime-richnav.yml index 5bf5ed8633935..cde767367de4f 100644 --- a/eng/pipelines/runtime-richnav.yml +++ b/eng/pipelines/runtime-richnav.yml @@ -3,6 +3,7 @@ trigger: branches: include: - master + - main - release/*.* paths: include: diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 0617d05b4a330..ad30bda4f8fd3 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -7,6 +7,7 @@ trigger: branches: include: - master + - main paths: include: - '*' @@ -27,7 +28,7 @@ pr: branches: include: - master - - dev/infrastructure + - main - release/*.* paths: include: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 045499e95b518..4f9557eb07453 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -7,7 +7,7 @@ trigger: branches: include: - master - - dev/infrastructure + - main - release/*.* paths: include: @@ -29,7 +29,7 @@ pr: branches: include: - master - - dev/infrastructure + - main - release/*.* paths: include: @@ -163,7 +163,7 @@ jobs: # # Build CoreCLR Formatting Job -# Only when CoreCLR is changed, and only in the 'master' branch (no release branches; +# Only when CoreCLR is changed, and only in the 'main' branch (no release branches; # both CI and PR builds). # - template: /eng/pipelines/common/platform-matrix.yml @@ -177,8 +177,8 @@ jobs: condition: >- and( or( - eq(variables['Build.SourceBranchName'], 'master'), - eq(variables['System.PullRequest.TargetBranch'], 'master')), + eq(variables['Build.SourceBranchName'], 'main'), + eq(variables['System.PullRequest.TargetBranch'], 'main')), or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(variables['isFullMatrix'], true)))