Skip to content

Commit dd5e502

Browse files
authored
Merge pull request webpack#8263 from webpack/ci/shorten-travis
CI: simplify travis
2 parents af4cb35 + 505184f commit dd5e502

File tree

5 files changed

+622
-662
lines changed

5 files changed

+622
-662
lines changed

.travis.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,32 @@ cache:
1414
- ".eslintcache"
1515

1616
stages:
17-
- basic
18-
- advanced
19-
- versions
17+
- basic
18+
- advanced
2019

2120
matrix:
2221
include:
2322
- os: linux
2423
node_js: "10"
25-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
24+
env:
25+
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
2626
stage: basic
2727
- os: linux
2828
node_js: "10"
29-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
29+
env:
30+
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
3031
stage: advanced
3132
- os: linux
3233
node_js: "10"
33-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
34+
env:
35+
NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
3436
stage: advanced
3537
- os: linux
3638
node_js: "10"
37-
env: NO_WATCH_TESTS=1 ALTERNATIVE_SORT=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
38-
stage: versions
39-
- os: osx
40-
node_js: "10"
41-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
42-
stage: versions
43-
- os: linux
44-
node_js: "8"
45-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
46-
stage: versions
47-
- os: linux
48-
node_js: "6"
49-
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
50-
stage: versions
39+
env:
40+
NO_WATCH_TESTS=1 ALTERNATIVE_SORT=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
41+
stage: advanced
5142
fast_finish: true
52-
allow_failures:
53-
- os: osx
5443

5544
install:
5645
- yarn --frozen-lockfile
@@ -66,4 +55,5 @@ after_success:
6655

6756
notifications:
6857
slack:
69-
secure: JduSdKWwbnLCwo7Z4E59SGE+Uw832UwnXzQiKEpg1BV45MYDPRiGltly1tRHmPh9OGjvGx3XSkC2tNGOBLtL4UL2SCkf012x0t7jDutKRfcv/njynl8jk8l+UhPmaWiHXDQAgGiiKdL4RfzPLW3HeVHCOWm0LKMzcarTa8tw+rE=
58+
secure:
59+
JduSdKWwbnLCwo7Z4E59SGE+Uw832UwnXzQiKEpg1BV45MYDPRiGltly1tRHmPh9OGjvGx3XSkC2tNGOBLtL4UL2SCkf012x0t7jDutKRfcv/njynl8jk8l+UhPmaWiHXDQAgGiiKdL4RfzPLW3HeVHCOWm0LKMzcarTa8tw+rE=

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ test_script:
3232
- cmd: yarn istanbul report --report lcovonly
3333
- cmd: yarn unlink webpack
3434
- cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
35-
- cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null
35+
- cmd:
36+
del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null

codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ coverage:
1818
target: 0%
1919
patch:
2020
default: off
21-
integration:
22-
flags: integration
21+
basic:
22+
flags: basic
2323
target: 90%
2424
base: pr
2525
integration:

0 commit comments

Comments
 (0)