From d7e7cd22824e4b6349c0071326f3c0090265b469 Mon Sep 17 00:00:00 2001 From: Hans Date: Mon, 16 Jul 2018 10:48:57 -0700 Subject: [PATCH] ci: fix validate script to properly report errors --- scripts/validate-build-files.ts | 4 +++- scripts/validate.ts | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/validate-build-files.ts b/scripts/validate-build-files.ts index 635869f99b..488ccddc14 100644 --- a/scripts/validate-build-files.ts +++ b/scripts/validate-build-files.ts @@ -11,7 +11,7 @@ import { existsSync } from 'fs'; import { join } from 'path'; import { packages } from '../lib/packages'; -export default function (_options: {}, logger: logging.Logger) { +export default async function (_options: {}, logger: logging.Logger) { let error = false; for (const pkgName of Object.keys(packages)) { @@ -37,4 +37,6 @@ export default function (_options: {}, logger: logging.Logger) { // process.exit(1); logger.warn('Found some BUILD files missing, which will be breaking your PR soon.'); } + + return 0; } diff --git a/scripts/validate.ts b/scripts/validate.ts index f4b9f78cc8..8a95adb3be 100644 --- a/scripts/validate.ts +++ b/scripts/validate.ts @@ -39,8 +39,8 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo logger.info(''); logger.info('Running commit validation...'); - validateCommits({}, logger.createChild('validate-commits')); - + error = await validateCommits({}, logger.createChild('validate-commits')) != 0 + || error; logger.info(''); logger.info('Running license validation...'); @@ -49,7 +49,8 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo logger.info(''); logger.info('Running BUILD files validation...'); - validateBuildFiles({}, logger.createChild('validate-build-files')); + error = await validateBuildFiles({}, logger.createChild('validate-build-files')) != 0 + || error; if (error) { return 101;