From b9dc7dca770da96f2667aee712c9098330e6d631 Mon Sep 17 00:00:00 2001 From: Tobias Koppers Date: Wed, 22 May 2019 14:01:02 +0200 Subject: [PATCH] fix flags in appveyor and travis remove cover:init --- .travis.yml | 2 +- appveyor.yml | 2 +- azure-pipelines.yml | 4 +--- package.json | 14 +++++++------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4536bb375..cb3504198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: stage: basic - os: linux node_js: "10" - env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit + env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lintunit stage: advanced - os: linux node_js: "10" diff --git a/appveyor.yml b/appveyor.yml index 94ecae79a..e20813b7a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,5 +31,5 @@ test_script: - cmd: yarn appveyor:integration - cmd: yarn istanbul report --report lcovonly - cmd: yarn unlink webpack - - cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov + - cmd: yarn global add codecov && codecov -F integration --disable=gcov - cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 72f6d4ce5..9a573c30e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -124,7 +124,6 @@ jobs: - script: | set -e export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" - yarn cover:init yarn cover:integration --ci --maxWorkers=2 --reporters=jest-junit displayName: "Run tests with coverage" - task: PublishTestResults@2 @@ -175,7 +174,6 @@ jobs: - script: | set -e export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" - yarn cover:init yarn cover:integration --ci --reporters=jest-junit displayName: "Run tests with coverage" - task: PublishTestResults@2 @@ -220,7 +218,7 @@ jobs: yarn link webpack --frozen-lockfile displayName: "Install dependencies" - script: | - yarn cover:init && yarn cover:integration --ci --maxWorkers=2 --reporters=jest-junit + yarn cover:integration --ci --maxWorkers=2 --reporters=jest-junit displayName: "Run tests with coverage" - task: PublishTestResults@2 inputs: diff --git a/package.json b/package.json index 6a5516e3b..ef5aacfbe 100644 --- a/package.json +++ b/package.json @@ -110,12 +110,12 @@ "test:integration": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"/test/*.test.js\"", "test:basic": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"/te{st/TestCasesNormal,st/StatsTestCases,st/ConfigTestCases}.test.js\"", "test:unit": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"/test/*.unittest.js\"", - "travis:integration": "yarn cover:init && yarn cover:integration --ci $JEST", - "travis:basic": "yarn test:basic --ci $JEST", - "travis:lint-unit": "yarn lint && yarn cover:init && yarn cover:unit --ci $JEST", + "travis:integration": "yarn cover:integration --ci $JEST", + "travis:basic": "yarn cover:basic --ci $JEST", + "travis:lintunit": "yarn lint && yarn cover:unit --ci $JEST", "travis:benchmark": "yarn benchmark --ci", - "appveyor:integration": "yarn cover:init && yarn cover:integration --ci %JEST%", - "appveyor:unit": "yarn cover:init && yarn cover:unit --ci %JEST%", + "appveyor:integration": "yarn cover:integration --ci %JEST%", + "appveyor:unit": "yarn cover:unit --ci %JEST%", "appveyor:benchmark": "yarn benchmark --ci", "build:examples": "cd examples && node buildAll.js", "pretest": "yarn lint", @@ -129,9 +129,9 @@ "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"", "jest-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"/test/*.lint.js\" --no-verbose", "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"/test/*.benchmark.js\" --runInBand", - "cover": "yarn cover:init && yarn cover:all && yarn cover:report", - "cover:init": "rimraf coverage", + "cover": "yarn cover:all && yarn cover:report", "cover:all": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --coverage", + "cover:basic": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"/te{st/TestCasesNormal,st/StatsTestCases,st/ConfigTestCases}.test.js\" --coverage", "cover:integration": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"/test/*.test.js\" --coverage", "cover:unit": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"/test/*.unittest.js\" --coverage", "cover:report": "istanbul report"