From fd73dea05e645041cf27a28ba67ce37eb6d4c6bc Mon Sep 17 00:00:00 2001 From: Jason Wray Date: Tue, 7 Aug 2018 20:01:05 -0400 Subject: Handle >2 branches by switching to split[0] --- scripts/environment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/environment.js b/scripts/environment.js index bb0be77886..0468be3720 100755 --- a/scripts/environment.js +++ b/scripts/environment.js @@ -24,7 +24,7 @@ if (pr) { } else { const head = process.env['CIRCLE_SHA1']; for (const sha of execSync(`git rev-list --max-count=10 ${head}`).toString().trim().split('\n')) { - const base = execSync(`git branch -r --contains ${sha} origin/master origin/release-*`).toString().replace(/$\n.*/m, '').trim().replace(/^origin\//, ''); + const base = execSync(`git branch -r --contains ${sha} origin/master origin/release-*`).toString().split('\n')[0].trim().replace(/^origin\//, ''); if (base) { const mergeBase = execSync(`git merge-base origin/${base} ${head}`).toString().trim(); console.log(`export CIRCLE_TARGET_BRANCH=${base}`); -- cgit v1.2.1