build: validate that templates are updated before submitting

hansl · hansl · commit bc26c2742aa5 · 2018-06-05T17:55:14.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,15 +20,15 @@ jobs:
       - run: npm install --quiet
       - run: npm run lint
 
-  commits:
+  validate:
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           key: angular_devkit-{{ checksum "package-lock.json" }}
 
       - run: npm install --quiet
-      - run: npm run validate-commits
+      - run: npm run validate
 
   test:
     <<: *defaults
@@ -87,7 +87,7 @@ workflows:
   default_workflow:
     jobs:
       - lint
-      - commits
+      - validate
       - build
       - test
       - integration
diff --git a/package.json b/package.json
@@ -18,8 +18,10 @@
     "build-tsc": "tsc -p tsconfig.json",
     "fix": "npm run admin -- lint --fix",
     "lint": "npm run admin -- lint",
+    "templates": "node ./bin/devkit-admin templates",
     "test": "node ./bin/devkit-admin test",
     "test:watch": "nodemon --watch packages -e ts ./bin/devkit-admin test",
+    "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
     "integration": "npm run build && npm run integration:build-optimizer",
     "integration:build-optimizer": "npm run integration:build-optimizer:simple && npm run integration:build-optimizer:aio",
diff --git a/scripts/validate.ts b/scripts/validate.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Logger, tags } from '@angular-devkit/core';
+import { execSync } from 'child_process';
+import templates from './templates';
+import validateCommits from './validate-commits';
+
+export default function (_: {}, logger: Logger) {
+  logger.info('Running templates validation...');
+
+  if (execSync(`git status --porcelain`).toString()) {
+    logger.fatal('There are local changes...');
+    process.exit(1);
+  }
+  templates({}, logger.createChild('templates'));
+  if (execSync(`git status --porcelain`).toString()) {
+    logger.fatal(tags.oneLine`
+      Running templates updated files... Please run "devkit-admin templates" before submitting
+      a PR.
+    `);
+    process.exit(2);
+  }
+
+  logger.info('Running commit validation...');
+  validateCommits({}, logger.createChild('validate-commits'));
+}
