Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: use CircleCI pipeline SHA variables for commit validation #18350

Merged
merged 1 commit into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 11 additions & 9 deletions scripts/validate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -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...');
Expand Down