Skip to content

chore(package): update defaults 1.4.0 support Webpack@3 #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
yarn.lock -diff

* text=auto
bin/* eol=lf
bin/* eol=lf
package-lock.json -diff
47 changes: 31 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
sudo: false
dist: trusty
language: node_js
branches:
only:
- master
matrix:
jobs:
fast_finish: true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you revert the travis.yml changes please, we have a organsation wide upgrade solution for this in place :)

allow_failures:
- env: WEBPACK_VERSION=canary
include:
- os: linux
node_js: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
- os: linux
node_js: '4.3'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '6'
env: WEBPACK_VERSION="2.2.0" JOB_PART=test
- os: linux
node_js: '7'
env: WEBPACK_VERSION="2.2.0" JOB_PART=coverage
- &test-latest
stage: Webpack latest
node_js: 6
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 4.3
env: WEBPACK_VERSION=latest JOB_PART=test
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=lint
script: npm run travis:$JOB_PART
- <<: *test-latest
node_js: 8
env: WEBPACK_VERSION=latest JOB_PART=coverage
script: npm run travis:$JOB_PART
after_success: 'bash <(curl -s https://codecov.io/bash)'
- stage: Webpack canary
before_script: npm i --no-save git://github.com/webpack/webpack.git#master
script: npm run travis:$JOB_PART
node_js: 8
env: WEBPACK_VERSION=canary JOB_PART=test
before_install:
- 'npm i -g npm@^5.0.0'
- nvm --version
- node --version
- npm --version
before_script:
- |-
if [ "$WEBPACK_VERSION" ]; then
yarn add webpack@^$WEBPACK_VERSION
npm i --no-save webpack@$WEBPACK_VERSION
fi
script:
- 'yarn run pretest'
- 'yarn run travis:$JOB_PART'
- 'npm run travis:$JOB_PART'
after_success:
- 'bash <(curl -s https://codecov.io/bash)'
36 changes: 16 additions & 20 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
# appveyor file
# http://www.appveyor.com/docs/appveyor-yml

init:
- git config --global core.autocrlf input

branches:
only:
- master

# what combinations to test
init:
- git config --global core.autocrlf input
environment:
matrix:
- nodejs_version: 7
- nodejs_version: '8'
webpack_version: latest
job_part: test
- nodejs_version: 6
- nodejs_version: '6'
webpack_version: latest
job_part: test
- nodejs_version: 4
- nodejs_version: '4.3'
webpack_version: latest
job_part: test

install:
- ps: Install-Product node $env:nodejs_version x64
- yarn install

build: off

build: 'off'
matrix:
fast_finish: true

install:
- ps: Install-Product node $env:nodejs_version x64
- cmd: npm i -g npm@latest
- npm install
before_test:
- cmd: npm install webpack@%webpack_version%
test_script:
- node --version
- npm --version
- cmd: yarn run appveyor:%job_part%
- cmd: npm run appveyor:%job_part%
Loading