build: better validation logging and does not break if verbose

hansl · hansl · commit 736ebd1d1ed7 · 2018-06-05T17:55:14.000-07:00
diff --git a/scripts/validate-commits.ts b/scripts/validate-commits.ts
@@ -32,12 +32,12 @@ export default function (_: {}, logger: Logger) {
       .toString().trim();
     sha = 'HEAD';
   }
-  logger.info('  Base: ' + baseSha);
-  logger.info('  HEAD: ' + sha);
+
+  logger.createChild('sha').info(`Base: ${baseSha}\nHEAD: ${sha}`);
 
   const log = execSync(`git log --oneline "${baseSha}..${sha}"`).toString().trim();
   logger.debug('Commits:');
-  logger.debug('  ' + log.split(/\n/).join('\n  '));
+  logger.createChild('commits').debug(log);
   logger.debug('');
 
   const commits = log.split(/\n/)
diff --git a/scripts/validate.ts b/scripts/validate.ts
@@ -10,22 +10,35 @@ import { execSync } from 'child_process';
 import templates from './templates';
 import validateCommits from './validate-commits';
 
-export default function (_: {}, logger: Logger) {
-  logger.info('Running templates validation...');
+export default function (options: { verbose: boolean }, logger: Logger) {
+  let error = false;
 
+  logger.info('Running templates validation...');
+  const templateLogger = logger.createChild('templates');
   if (execSync(`git status --porcelain`).toString()) {
-    logger.fatal('There are local changes...');
-    process.exit(1);
+    logger.error('There are local changes.');
+    if (!options.verbose) {
+      process.exit(1);
+    }
+    error = true;
   }
-  templates({}, logger.createChild('templates'));
+  templates({}, templateLogger);
   if (execSync(`git status --porcelain`).toString()) {
-    logger.fatal(tags.oneLine`
+    logger.error(tags.oneLine`
       Running templates updated files... Please run "devkit-admin templates" before submitting
       a PR.
     `);
-    process.exit(2);
+    if (!options.verbose) {
+      process.exit(2);
+    }
+    error = true;
   }
 
+  logger.info('');
   logger.info('Running commit validation...');
   validateCommits({}, logger.createChild('validate-commits'));
+
+  if (error) {
+    process.exit(101);
+  }
 }
