ci: use CircleCI pipeline SHA variables for commit validation

clydin · alan-agius4 · commit c75ae2502535 · 2020-07-23T22:41:00.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -166,7 +166,14 @@ jobs:
     executor: action-executor
     steps:
       - custom_attach_workspace
-      - run: yarn validate --ci
+      - run:
+          name: Validate Commit Messages
+          command: yarn -s admin validate-commits --base <<pipeline.git.base_revision>> --head <<pipeline.git.revision>>
+      - run:
+          name: Validate "do not submit" Commits
+          command: yarn -s admin validate-do-not-submit --base <<pipeline.git.base_revision>> --head <<pipeline.git.revision>>
+      - run:
+          command: yarn -s admin validate --ci
 
   e2e-cli:
     parameters:
diff --git a/scripts/validate.ts b/scripts/validate.ts
@@ -15,7 +15,7 @@ import validateDoNotSubmit from './validate-do-not-submit';
 import validateLicenses from './validate-licenses';
 import validateUserAnalytics from './validate-user-analytics';
 
-export default async function (options: { verbose: boolean }, logger: logging.Logger) {
+export default async function (options: { verbose: boolean; ci: boolean }, logger: logging.Logger) {
   let error = false;
 
   if (execSync(`git status --porcelain`).toString()) {
@@ -40,15 +40,17 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
     error = true;
   }
 
-  logger.info('');
-  logger.info('Running commit validation...');
-  error = validateCommits({}, logger.createChild('validate-commits')) != 0
-       || error;
+  if (!options.ci) {
+    logger.info('');
+    logger.info('Running commit validation...');
+    error = validateCommits({}, logger.createChild('validate-commits')) != 0
+        || error;
 
-  logger.info('');
-  logger.info(`Running DO_NOT${''}_SUBMIT validation...`);
-  error = await validateDoNotSubmit({}, logger.createChild('validate-do-not-submit')) != 0
-       || error;
+    logger.info('');
+    logger.info(`Running DO_NOT${''}_SUBMIT validation...`);
+    error = await validateDoNotSubmit({}, logger.createChild('validate-do-not-submit')) != 0
+        || error;
+  }
 
   logger.info('');
   logger.info('Running license validation...');
