Skip to content

Commit 68d526c

Browse files
authoredSep 12, 2022
Don't run linter after tests runs (#50597)
1 parent 8e5e2e0 commit 68d526c

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed
 

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- run: npm ci
3333

3434
- name: Tests
35-
run: npm test -- --no-lint
35+
run: npm test
3636

3737
lint:
3838
runs-on: ubuntu-latest

‎Gulpfile.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,8 @@ task("watch-local").flags = {
424424
const preTest = parallel(buildTsc, buildTests, buildServices, buildLssl);
425425
preTest.displayName = "preTest";
426426

427-
const postTest = (done) => cmdLineOptions.lint ? lint() : done();
428-
429427
const runTests = () => runConsoleTests("built/local/run.js", "mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*watchMode*/ false);
430-
task("runtests", series(preBuild, preTest, runTests, postTest));
428+
task("runtests", series(preBuild, preTest, runTests));
431429
task("runtests").description = "Runs the tests using the built run.js file.";
432430
task("runtests").flags = {
433431
"-t --tests=<regex>": "Pattern for tests to run.",
@@ -439,18 +437,16 @@ task("runtests").flags = {
439437
" --dirty": "Run tests without first cleaning test output directories",
440438
" --stackTraceLimit=<limit>": "Sets the maximum number of stack frames to display. Use 'full' to show all frames.",
441439
" --no-color": "Disables color",
442-
" --no-lint": "Disables lint",
443440
" --timeout=<ms>": "Overrides the default test timeout.",
444441
" --built": "Compile using the built version of the compiler.",
445442
" --shards": "Total number of shards running tests (default: 1)",
446443
" --shardId": "1-based ID of this shard (default: 1)",
447444
};
448445

449446
const runTestsParallel = () => runConsoleTests("built/local/run.js", "min", /*runInParallel*/ cmdLineOptions.workers > 1, /*watchMode*/ false);
450-
task("runtests-parallel", series(preBuild, preTest, runTestsParallel, postTest));
447+
task("runtests-parallel", series(preBuild, preTest, runTestsParallel));
451448
task("runtests-parallel").description = "Runs all the tests in parallel using the built run.js file.";
452449
task("runtests-parallel").flags = {
453-
" --no-lint": "disables lint.",
454450
" --light": "Run tests in light mode (fewer verifications, but tests run faster).",
455451
" --keepFailed": "Keep tests in .failed-tests even if they pass.",
456452
" --dirty": "Run tests without first cleaning test output directories.",
@@ -613,7 +609,6 @@ task("watch").flags = {
613609
" --dirty": "Run tests without first cleaning test output directories",
614610
" --stackTraceLimit=<limit>": "Sets the maximum number of stack frames to display. Use 'full' to show all frames.",
615611
" --no-color": "Disables color",
616-
" --no-lint": "Disables lint",
617612
" --timeout=<ms>": "Overrides the default test timeout.",
618613
" --workers=<number>": "The number of parallel workers to use.",
619614
" --built": "Compile using the built version of the compiler.",

‎scripts/build/options.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const ci = ["1", "true"].includes(process.env.CI);
66

77
/** @type {CommandLineOptions} */
88
module.exports = minimist(process.argv.slice(2), {
9-
boolean: ["dirty", "light", "colors", "lint", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built", "ci"],
9+
boolean: ["dirty", "light", "colors", "lkg", "soft", "fix", "failed", "keepFailed", "force", "built", "ci"],
1010
string: ["browser", "tests", "break", "host", "reporter", "stackTraceLimit", "timeout", "shards", "shardId"],
1111
alias: {
1212
/* eslint-disable quote-props */
@@ -33,7 +33,6 @@ module.exports = minimist(process.argv.slice(2), {
3333
runners: process.env.runners || process.env.runner || process.env.ru,
3434
light: process.env.light === undefined || process.env.light !== "false",
3535
reporter: process.env.reporter || process.env.r,
36-
lint: process.env.lint || true,
3736
fix: process.env.fix || process.env.f,
3837
workers: process.env.workerCount || ((os.cpus().length - (ci ? 0 : 1)) || 1),
3938
failed: false,
@@ -54,7 +53,6 @@ if (module.exports.built) {
5453
* @property {boolean} dirty
5554
* @property {boolean} light
5655
* @property {boolean} colors
57-
* @property {boolean} lint
5856
* @property {boolean} lkg
5957
* @property {boolean} built
6058
* @property {boolean} soft

0 commit comments

Comments
 (0)
Please sign in to comment.