From 65fca8682cd488a0f980e0c5edd0d5ffa5fa99cf Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 16 Jan 2019 15:23:14 -0800 Subject: [PATCH] Batch merge builds together while a merge build is running --- .vsts-ci/install-ps.yml | 2 ++ .vsts-ci/linux.yml | 2 ++ .vsts-ci/mac.yml | 2 ++ .vsts-ci/misc-analysis.yml | 2 ++ .vsts-ci/windows.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/.vsts-ci/install-ps.yml b/.vsts-ci/install-ps.yml index 04331a01741..97502e4f69a 100644 --- a/.vsts-ci/install-ps.yml +++ b/.vsts-ci/install-ps.yml @@ -1,5 +1,7 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: + # Batch merge builds together while a merge build is running + batch: true branches: include: - master diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml index 3a2f9337b9c..384ea4ae2cf 100644 --- a/.vsts-ci/linux.yml +++ b/.vsts-ci/linux.yml @@ -1,5 +1,7 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: + # Batch merge builds together while a merge build is running + batch: true branches: include: - master diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml index 6c102c332aa..b60f523e85a 100644 --- a/.vsts-ci/mac.yml +++ b/.vsts-ci/mac.yml @@ -1,5 +1,7 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: + # Batch merge builds together while a merge build is running + batch: true branches: include: - master diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml index 05880d653b2..c9f49926795 100644 --- a/.vsts-ci/misc-analysis.yml +++ b/.vsts-ci/misc-analysis.yml @@ -1,5 +1,7 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: + # Batch merge builds together while a merge build is running + batch: true branches: include: - master diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml index 6ec69906bf9..d2c31779857 100644 --- a/.vsts-ci/windows.yml +++ b/.vsts-ci/windows.yml @@ -1,5 +1,7 @@ name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr) trigger: + # Batch merge builds together while a merge build is running + batch: true branches: include: - master