From 6c092ea20fd9adf671be963612ea53235913076b Mon Sep 17 00:00:00 2001 From: Eric Sciple Date: Fri, 2 Dec 2016 14:33:16 -0500 Subject: [PATCH] Fix aggregate layout issue --- make-util.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-util.js b/make-util.js index b653a1f36cb9..1dfca88864ce 100644 --- a/make-util.js +++ b/make-util.js @@ -772,7 +772,7 @@ var getRefs = function () { var branch; if (process.env.TF_BUILD) { // during CI agent checks out a commit, not a branch. - // $(build.sourceBranch) indicates the branch name, e.g. refs/heads/releases/m108 + // $(build.sourceBranch) indicates the branch name, e.g. releases/m108 branch = process.env.BUILD_SOURCEBRANCH; } else { @@ -785,7 +785,7 @@ var getRefs = function () { assert(branch, 'branch'); var commit = run('git rev-parse --short=8 HEAD', /*inheritStreams*/false, /*noHeader*/true); var release; - if (branch.match(/^refs\/heads\/releases\/m[0-9]+$/)) { + if (branch.match(/^(refs\/heads\/)?releases\/m[0-9]+$/)) { release = parseInt(branch.split('/').pop().substr(1)); }