Skip to content

Commit 9160102

Browse files
joshwiensmichael-ciniawsky
authored andcommitted
build(defaults): v0.4.6...1.6.0 (webpack-contrib#626)
1 parent 5d08293 commit 9160102

File tree

7 files changed

+10124
-5359
lines changed

7 files changed

+10124
-5359
lines changed

.babelrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"useBuiltIns": true,
77
"targets": {
8-
"node": 4.3
8+
"node": "4.8"
99
},
1010
"exclude": [
1111
"transform-async-to-generator",
@@ -32,4 +32,4 @@
3232
]
3333
}
3434
}
35-
}
35+
}

.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
yarn.lock -diff
22
* text=auto
3-
bin/* eol=lf
3+
bin/* eol=lf
4+
package-lock.json -diff

.travis.yml

+31-15
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,48 @@
11
sudo: false
2+
dist: trusty
23
language: node_js
34
branches:
45
only:
56
- master
6-
matrix:
7+
jobs:
78
fast_finish: true
9+
allow_failures:
10+
- env: WEBPACK_VERSION=canary
811
include:
9-
- os: linux
10-
node_js: '7'
11-
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
12-
- os: linux
13-
node_js: '4.3'
14-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
15-
- os: linux
16-
node_js: '6'
17-
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
18-
- os: linux
19-
node_js: '7'
20-
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
12+
- &test-latest
13+
stage: Webpack latest
14+
node_js: 6
15+
env: WEBPACK_VERSION=latest JOB_PART=test
16+
script: npm run travis:$JOB_PART
17+
- <<: *test-latest
18+
node_js: 4.8
19+
env: WEBPACK_VERSION=latest JOB_PART=test
20+
script: npm run travis:$JOB_PART
21+
- <<: *test-latest
22+
node_js: 8
23+
env: WEBPACK_VERSION=latest JOB_PART=lint
24+
script: npm run travis:$JOB_PART
25+
- <<: *test-latest
26+
node_js: 8
27+
env: WEBPACK_VERSION=latest JOB_PART=coverage
28+
script: npm run travis:$JOB_PART
29+
after_success: 'bash <(curl -s https://codecov.io/bash)'
30+
- stage: Webpack canary
31+
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
32+
script: npm run travis:$JOB_PART
33+
node_js: 8
34+
env: WEBPACK_VERSION=canary JOB_PART=test
2135
before_install:
36+
- 'if [[ `npm -v` != 5* ]]; then npm i -g npm@^5.0.0; fi'
2237
- nvm --version
2338
- node --version
39+
- npm --version
2440
before_script:
2541
- |-
2642
if [ "$WEBPACK_VERSION" ]; then
27-
yarn add webpack@^$WEBPACK_VERSION
43+
npm i --no-save webpack@$WEBPACK_VERSION
2844
fi
2945
script:
30-
- 'yarn run travis:$JOB_PART'
46+
- 'npm run travis:$JOB_PART'
3147
after_success:
3248
- 'bash <(curl -s https://codecov.io/bash)'

appveyor.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
branches:
2+
only:
3+
- master
4+
init:
5+
- git config --global core.autocrlf input
6+
environment:
7+
matrix:
8+
- nodejs_version: '8'
9+
webpack_version: latest
10+
job_part: test
11+
- nodejs_version: '6'
12+
webpack_version: latest
13+
job_part: test
14+
- nodejs_version: '4.8'
15+
webpack_version: latest
16+
job_part: test
17+
build: 'off'
18+
matrix:
19+
fast_finish: true
20+
install:
21+
- ps: Install-Product node $env:nodejs_version x64
22+
- npm i -g npm@latest
23+
- npm install
24+
before_test:
25+
- cmd: npm install webpack@%webpack_version%
26+
test_script:
27+
- node --version
28+
- npm --version
29+
- cmd: npm run appveyor:%job_part%

0 commit comments

Comments
 (0)