Skip to content

Commit

Permalink
Merge pull request #12 from simplabs/yarn
Browse files Browse the repository at this point in the history
Use Yarn instead of outdated npm
  • Loading branch information
Turbo87 committed Sep 26, 2017
2 parents bd7c76d + dc7fb1b commit 5143714
Show file tree
Hide file tree
Showing 4 changed files with 6,460 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
---
language: node_js
node_js:
- "6"
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"

sudo: false

cache:
yarn: true
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add bower phantomjs-prebuilt
- bower --version
- phantomjs --version

install:
- npm install
- yarn install --no-lockfile
- bower install

script:
- node_modules/.bin/ember try:each
- yarn run ember try:each

deploy:
provider: npm
Expand Down
2 changes: 2 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* jshint node:true*/
/* global require, module */
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
Expand Down
2 changes: 2 additions & 0 deletions hbs-minifier-plugin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

/* eslint-env node */

const WHITESPACE = /^\s+$/;
Expand Down
Loading

0 comments on commit 5143714

Please sign in to comment.