diff options
author | Jason Wray <jason@mapbox.com> | 2018-08-07 15:06:55 -0400 |
---|---|---|
committer | Jason Wray <friedbunny@users.noreply.github.com> | 2018-08-08 08:44:03 -0400 |
commit | ff70d13e8234dcb124bf597eaf38e6bf86888e94 (patch) | |
tree | 28438e5fedba2d4447bd71d66d3bda6abc3d5b45 | |
parent | 0ec4a84c310f4bf95265939698d71f267af5802e (diff) | |
download | qtlocation-mapboxgl-ff70d13e8234dcb124bf597eaf38e6bf86888e94.tar.gz |
[build] Fix CI failure when master and release branch are identical
The search for branches containing the previous hash could return multiple matches on different lines, if, for instance, a newly-cut release branch were identical to master.
-rwxr-xr-x | scripts/environment.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/environment.js b/scripts/environment.js index 9777377f19..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().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}`); |