Merge pull request #11602 from Snuffleupagus/gulp-lint-chromium

Move validation of `chromium/preferences_schema.json` to its own gulp task
This commit is contained in:
Tim van der Meij 2020-02-16 13:42:09 +01:00 committed by GitHub
commit 64351caf1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1389,9 +1389,7 @@ gulp.task(
}) })
); );
gulp.task( gulp.task("lint", function(done) {
"lint",
gulp.series("default_preferences", function(done) {
console.log(); console.log();
console.log("### Linting JS files"); console.log("### Linting JS files");
@ -1409,9 +1407,16 @@ gulp.task(
done(new Error("ESLint failed.")); done(new Error("ESLint failed."));
return; return;
} }
console.log("files checked, no errors found");
done();
});
});
gulp.task(
"lint-chromium",
gulp.series("default_preferences", function(done) {
console.log(); console.log();
console.log("### Checking supplemental files"); console.log("### Checking supplemental Chromium files");
if ( if (
!checkChromePreferencesFile( !checkChromePreferencesFile(
@ -1422,10 +1427,7 @@ gulp.task(
done(new Error("chromium/preferences_schema is not in sync.")); done(new Error("chromium/preferences_schema is not in sync."));
return; return;
} }
console.log("files checked, no errors found");
done(); done();
});
}) })
); );
@ -1838,5 +1840,8 @@ gulp.task("externaltest", function(done) {
gulp.task( gulp.task(
"npm-test", "npm-test",
gulp.series(gulp.parallel("lint", "externaltest"), "unittestcli") gulp.series(
gulp.parallel("lint", "externaltest", "unittestcli"),
"lint-chromium"
)
); );