Skip to content

Commit d46e35e

Browse files
sokrasokra
committed
Merge branch 'master' into feature/wasm-mangling
# Conflicts: # yarn.lock
2 parents ec0369d + 8af0320 commit d46e35e

File tree

98 files changed

+1956
-838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1956
-838
lines changed

‎.travis.yml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,42 +9,56 @@ branches:
99

1010
cache:
1111
yarn: true
12+
directories:
13+
- ".jest-cache"
14+
- ".eslintcache"
15+
16+
stages:
17+
- basic
18+
- advanced
19+
- versions
1220

1321
matrix:
1422
include:
1523
- os: linux
1624
node_js: "10"
17-
env: NO_WATCH_TESTS=1 JOB_PART=lint
25+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=basic
26+
stage: basic
1827
- os: linux
1928
node_js: "10"
20-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
21-
- os: linux
22-
node_js: "8"
23-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
29+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=lint-unit
30+
stage: advanced
2431
- os: linux
2532
node_js: "10"
26-
env: NO_WATCH_TESTS=1 JOB_PART=unit
27-
- os: linux
28-
node_js: "6"
29-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
33+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
34+
stage: advanced
3035
- os: osx
3136
node_js: "10"
32-
env: NO_WATCH_TESTS=1 JEST=--maxWorkers=2 JOB_PART=integration
37+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
38+
stage: versions
39+
- os: linux
40+
node_js: "8"
41+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
42+
stage: versions
43+
- os: linux
44+
node_js: "6"
45+
env: NO_WATCH_TESTS=1 JEST="--maxWorkers=2 --cacheDirectory .jest-cache" JOB_PART=integration
46+
stage: versions
47+
fast_finish: true
3348
allow_failures:
3449
- os: osx
35-
fast_finish: true
3650

3751
install:
3852
- yarn --frozen-lockfile
3953
- yarn link --frozen-lockfile || true
4054
- yarn link webpack --frozen-lockfile
4155

42-
script: npm run travis:$JOB_PART
56+
script: yarn travis:$JOB_PART
4357

4458
after_success:
4559
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
4660
- bash <(curl -s https://codecov.io/bash) -F $JOB_PART -X gcov
47-
- rm -rf ./coverage
61+
- rm -f .jest-cache/haste-map* .jest-cache/perf-cache*
4862

4963
notifications:
5064
slack:

‎README.md

Lines changed: 93 additions & 52 deletions
Large diffs are not rendered by default.

‎appveyor.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,28 @@ branches:
99
init:
1010
- git config --global core.autocrlf input
1111

12+
cache:
13+
- "..\\.yarn-cache"
14+
- ".jest-cache"
15+
1216
# what combinations to test
1317
environment:
1418
matrix:
15-
- nodejs_version: 8
19+
- nodejs_version: 10
1620
job_part: unit
17-
- nodejs_version: 8
21+
jest: --maxWorkers=2 --cacheDirectory .jest-cache
22+
- nodejs_version: 10
1823
job_part: integration
19-
jest: --maxWorkers=2
24+
jest: --maxWorkers=2 --cacheDirectory .jest-cache
2025
- nodejs_version: 6
2126
job_part: integration
22-
jest: --maxWorkers=2
27+
jest: --maxWorkers=2 --cacheDirectory .jest-cache
2328

2429
install:
2530
- ps: Install-Product node $env:nodejs_version x64
26-
- npm install yarn -g
27-
- yarn install --frozen-lockfile
28-
- yarn link --frozen-lockfile || yarn link --frozen-lockfile
29-
- yarn link webpack --frozen-lockfile
31+
- yarn --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
32+
- yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache || yarn link --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
33+
- yarn link webpack --frozen-lockfile --preferred-cache-folder ..\\.yarn-cache
3034

3135
build: off
3236

@@ -38,5 +42,7 @@ test_script:
3842
- yarn --version
3943
- cmd: set JEST=%jest%
4044
- cmd: yarn appveyor:%job_part%
45+
- cmd: yarn istanbul report --report lcovonly
4146
- cmd: yarn unlink webpack
4247
- cmd: yarn global add codecov && codecov -F %job_part% --disable=gcov
48+
- cmd: del /F /Q .jest-cache\\haste-map* .jest-cache\\perf-cache* 2> null || Ver > null

‎codecov.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ coverage:
77
status:
88
project:
99
default: off
10+
basic:
11+
flags: basic
12+
target: auto
1013
integration:
1114
flags: integration
1215
target: auto
@@ -15,6 +18,10 @@ coverage:
1518
target: 0%
1619
patch:
1720
default: off
21+
integration:
22+
flags: integration
23+
target: 90%
24+
base: pr
1825
integration:
1926
flags: integration
2027
target: 90%
@@ -25,10 +32,18 @@ coverage:
2532
base: pr
2633
changes:
2734
default: off
35+
basic:
36+
flags: basic
37+
target: 0%
2838
integration:
2939
flags: integration
3040
target: 0%
3141
unit:
3242
flags: unit
3343
target: 0%
3444
comment: off
45+
flags:
46+
basic:
47+
joined: false
48+
unit:
49+
joined: false

0 commit comments

Comments
 (0)