summaryrefslogtreecommitdiff
path: root/azure-pipelines.yml
diff options
context:
space:
mode:
authorWilliam Godbe <wigodbe@microsoft.com>2019-04-08 09:20:33 -0700
committerGitHub <noreply@github.com>2019-04-08 09:20:33 -0700
commit08d1cd0db9e6270164c90a4d4ddf16df39dbe4c7 (patch)
treee9493c40354e7253e919e74f8617b76358f9f7e5 /azure-pipelines.yml
parentd4227224443d43cdc94c5315ba6a8b80bfa0ba6b (diff)
parent5db0a942a36471110c262ccfc66a4310138dfa77 (diff)
downloadcoreclr-08d1cd0db9e6270164c90a4d4ddf16df39dbe4c7.tar.gz
coreclr-08d1cd0db9e6270164c90a4d4ddf16df39dbe4c7.tar.bz2
coreclr-08d1cd0db9e6270164c90a4d4ddf16df39dbe4c7.zip
Merge branch 'release/3.0' into merge/master-to-release/3.0
Diffstat (limited to 'azure-pipelines.yml')
-rw-r--r--azure-pipelines.yml16
1 files changed, 10 insertions, 6 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 07aa294156..a268b056d6 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