EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3501 gulp: Fix HEAD commit calculation

main
Dani Palou 2020-09-10 12:27:22 +02:00
parent e6ac209756
commit 9de15f243b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gulp/task-push.js
View File

@ -248,7 +248,10 @@ class PushTask {
if (numConsecutive > 2) { if (numConsecutive > 2) {
// 3 consecutive commits with different branch, probably the branch commits are over. Everything OK. // 3 consecutive commits with different branch, probably the branch commits are over. Everything OK.
return true; return true;
} else if (!wrongCommitCandidate) {
// Don't treat a merge pull request commit as a wrong commit between right commits.
// The current push could be a quick fix after a merge.
} else if (!wrongCommitCandidate && message.indexOf('Merge pull request') == -1) {
wrongCommitCandidate = { wrongCommitCandidate = {
message: message, message: message,
issue: issue, issue: issue,

2
gulp/utils.js
View File

@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
const DevConfig = require('./dev-config'); const DevConfig = require('./dev-config');
const DEFAULT_ISSUE_REGEX = '(MOBILE)[-_]([0-9]+)'; const DEFAULT_ISSUE_REGEX = '^(MOBILE)[-_]([0-9]+)';
/** /**
* Class with some utility functions. * Class with some utility functions.