diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-04-19 10:39:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 10:39:20 -0700 |
| commit | 85c35767d2c34fe4a4d7b977d7423595a4e8955b (patch) | |
| tree | 94c26814bc7823204245441b80bd662bdf381047 /azure-pipelines.yml | |
| parent | f47de43230df6d8400b22159ae06ed80cfc9cb7f (diff) | |
| parent | 9562c551f391635ce81869aabc84f894c2846be8 (diff) | |
| download | coreclr-85c35767d2c34fe4a4d7b977d7423595a4e8955b.tar.gz coreclr-85c35767d2c34fe4a4d7b977d7423595a4e8955b.tar.bz2 coreclr-85c35767d2c34fe4a4d7b977d7423595a4e8955b.zip | |
Merge branch 'release/3.0' into merge/master-to-release/3.0
Diffstat (limited to 'azure-pipelines.yml')
| -rw-r--r-- | azure-pipelines.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f1a9205f30..179b880340 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,13 @@ +trigger: + batch: true + branches: + include: + - master + - release/3.0 + +pr: +- master +- release/3.0 # Temporarily set a build number format that includes a large revision # number that won't conflict with buildpipeline official builds. @@ -26,12 +36,6 @@ resources: - container: centos6_x64_build_image image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-6-376e1a3-20174311014331 -trigger: -- master - -pr: -- master - jobs: ## The following is the matrix of test runs that we have. This is |