ci: validate commit messages correctly when not on master (#19685)
PR Close #19685
This commit is contained in:

committed by
Tobias Bosch

parent
9b264c5c78
commit
d75a9fabdc
@ -6,37 +6,48 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
|
||||
// tslint:disable:no-console
|
||||
module.exports = (gulp) => () => {
|
||||
const validateCommitMessage = require('../validate-commit-message');
|
||||
const childProcess = require('child_process');
|
||||
const shelljs = require('shelljs');
|
||||
|
||||
let baseBranch = 'master';
|
||||
const currentVersion = require('semver').parse(require('../../package.json').version);
|
||||
const baseHead =
|
||||
shelljs.exec(`git ls-remote --heads origin ${currentVersion.major}.${currentVersion.minor}.*`)
|
||||
.trim()
|
||||
.split('\n')
|
||||
.pop();
|
||||
if (baseHead) {
|
||||
const match = /refs\/heads\/(.+)/.exec(baseHead);
|
||||
baseBranch = match && match[1] || baseBranch;
|
||||
}
|
||||
|
||||
// We need to fetch origin explicitly because it might be stale.
|
||||
// I couldn't find a reliable way to do this without fetch.
|
||||
childProcess.exec(
|
||||
'git fetch origin master && git log --reverse --format=%s HEAD ^origin/master',
|
||||
(error, stdout, stderr) => {
|
||||
if (error) {
|
||||
console.log(stderr);
|
||||
process.exit(1);
|
||||
}
|
||||
result = shelljs.exec(
|
||||
`git fetch origin ${baseBranch} && git log --reverse --format=%s HEAD ^origin/${baseBranch}`);
|
||||
|
||||
let someCommitsInvalid = false;
|
||||
let commitsByLine = stdout.trim().split(/\n/).filter(line => line != '');
|
||||
if (result.code) {
|
||||
console.log(result.stderr);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`Examining ${commitsByLine.length} commits between HEAD and master`);
|
||||
const commitsByLine = result.trim().split(/\n/).filter(line => line != '');
|
||||
|
||||
if (commitsByLine.length == 0) {
|
||||
console.log('There are zero new commits between this HEAD and master');
|
||||
}
|
||||
console.log(`Examining ${commitsByLine.length} commits between HEAD and ${baseBranch}`);
|
||||
|
||||
someCommitsInvalid = !commitsByLine.every(validateCommitMessage);
|
||||
if (commitsByLine.length == 0) {
|
||||
console.log(`There are zero new commits between this HEAD and ${baseBranch}`);
|
||||
}
|
||||
|
||||
if (someCommitsInvalid) {
|
||||
console.log('Please fix the failing commit messages before continuing...');
|
||||
console.log(
|
||||
'Commit message guidelines: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines');
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
const someCommitsInvalid = !commitsByLine.every(validateCommitMessage);
|
||||
|
||||
if (someCommitsInvalid) {
|
||||
console.log('Please fix the failing commit messages before continuing...');
|
||||
console.log(
|
||||
'Commit message guidelines: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines');
|
||||
process.exit(1);
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user