[build] Look further back for branch merge base
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user