Skip to content
This repository has been archived by the owner on May 11, 2018. It is now read-only.

Include yarn.lock and update CI #124

Merged
merged 1 commit into from
Jan 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
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ node_modules
scripts
.eslintignore
.travis.yml
yarn.lock
24 changes: 20 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,35 @@ git:
sudo: false
language: node_js
cache:
yarn: true
directories:
- node_modules
- node_modules
node_js:
- '7'
- '6'
- '4'
- '0.12'
- '0.10'
env:
- PKG_CMD="npm"
- PKG_CMD="yarn"
before_install:
- nvm use $TRAVIS_NODE_VERSION
- npm set loglevel error
- npm set progress false
- 'if [ $PKG_CMD = "yarn" ]; then npm i -g yarn ; fi'
install:
- $PKG_CMD install
script:
- 'if [ -n "${LINT-}" ]; then npm run lint ; fi'
- 'if [ -z "${LINT-}" ]; then npm run ci ; fi'
- 'if [ -n "${LINT-}" ]; then $PKG_CMD run lint ; fi'
- 'if [ -z "${LINT-}" ]; then $PKG_CMD run ci ; fi'
matrix:
fast_finish: true
exclude:
- node_js: "0.10"
env: PKG_CMD="yarn"
- node_js: "0.12"
env: PKG_CMD="yarn"
include:
- node_js: "node"
env: LINT=true
env: LINT=true PKG_CMD="npm"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"babel-plugin-transform-flow-strip-types": "^6.8.0",
"babel-preset-es2015": "^6.14.0",
"babel-register": "^6.14.0",
"compat-table": "github:kangax/compat-table#e732718eab42c6c83a364450f456474638d31f94",
"compat-table": "kangax/compat-table#e732718eab42c6c83a364450f456474638d31f94",
Copy link
Member

Choose a reason for hiding this comment

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

can we do this now? @chicoxyzzy

Copy link
Member

Choose a reason for hiding this comment

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

It doesn't change commit hash so I assume it's safe change

"eslint": "^3.3.1",
"eslint-config-babel": "^3.0.0",
"eslint-plugin-babel": "^4.0.0",
Expand Down
Loading