Skip to content
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
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ env:
global:
- WP_TRAVISCI=phpunit

cache:
directories:
- ~/.yarn
- ~/.nvm
cache: yarn

# Next we define our matrix of additional build configurations to test against.
# The versions listed above will automatically create our first configuration,
Expand All @@ -32,11 +29,11 @@ cache:
matrix:
include:
- php: "5.6"
env: WP_TRAVISCI="npm run lint"
env: WP_TRAVISCI="yarn lint"
- php: "5.6"
env: WP_TRAVISCI="npm run test-client"
env: WP_TRAVISCI="yarn test-client"
- php: "5.6"
env: WP_TRAVISCI="npm run test-gui"
env: WP_TRAVISCI="yarn test-gui"
- php: "5.2"
- php: "5.3"
- php: "5.5"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build-client": "gulp",
"build-production": "yarn clean-client && gulp languages:extract && NODE_ENV=production BABEL_ENV=production yarn build",
"build-languages": "gulp languages",
"lint": "eslint --ext .js --ext .jsx _inc/client -c .eslintrc",
"lint": "yarn build && eslint --ext .js --ext .jsx _inc/client -c .eslintrc",
"test-client": "NODE_ENV=test NODE_PATH=tests:_inc/client:node_modules/@automattic/dops-components/client tests/runner.js",
"add-textdomain": "grunt addtextdomain",
"build-pot": "grunt makepot",
Expand Down
6 changes: 3 additions & 3 deletions tests/run-travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ else

gem install sass
gem install compass
npm install -g npm
npm install -g gulp-cli
npm install
rm -rf ~/.yarn
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.20.3
yarn

if $WP_TRAVISCI; then
# Everything is fine
Expand Down