summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJason Wray <friedbunny@users.noreply.github.com>2019-08-13 14:43:11 -0700
committerGitHub <noreply@github.com>2019-08-13 14:43:11 -0700
commitf8901e2b10732b34a0a66d89261a611cef0d0a71 (patch)
tree8e95063ec0c95489403bf6266c4e094a515b47d9 /scripts
parent1ffb417bdb86bfa290dd1984140e7d83ea6ce7fd (diff)
downloadqtlocation-mapboxgl-f8901e2b10732b34a0a66d89261a611cef0d0a71.tar.gz
[build] Look further back for branch merge base
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/environment.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/environment.js b/scripts/environment.js
index 0468be3720..759a7f2a42 100755
--- a/scripts/environment.js
+++ b/scripts/environment.js
@@ -23,7 +23,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')) {
+ for (const sha of execSync(`git rev-list --max-count=500 ${head}`).toString().trim().split('\n')) {
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();