From 0a4976f4ac4efbee52831d0c5305b9edf7e0f5d2 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 24 Apr 2015 13:13:00 +0200 Subject: [PATCH] Use ember-try to test beta and canary ember versions --- .travis.yml | 19 ++++++++++++++++++- config/ember-try.js | 26 ++++++++++++++++++++++++++ package.json | 17 +++++++++-------- 3 files changed, 53 insertions(+), 9 deletions(-) create mode 100644 config/ember-try.js diff --git a/.travis.yml b/.travis.yml index fa148e98..09cb62b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,20 @@ language: node_js node_js: "0.10.36" +env: + - EMBER_VERSION=default + - EMBER_VERSION=release + - EMBER_VERSION=beta + - EMBER_VERSION=canary + +matrix: + allow_failures: + - env: EMBER_VERSION=release + - env: EMBER_VERSION=beta + - env: EMBER_VERSION=canary + + fast_finish: true + addons: sauce_connect: true @@ -21,7 +35,7 @@ install: - bower install script: - - npm test + - ember try $EMBER_VERSION notifications: campfire: @@ -42,3 +56,6 @@ deploy: acl: public_read local_dir: dist region: us-east-1 + on: + branch: master + condition: "$EMBER_VERSION = default" diff --git a/config/ember-try.js b/config/ember-try.js new file mode 100644 index 00000000..c99300ff --- /dev/null +++ b/config/ember-try.js @@ -0,0 +1,26 @@ +module.exports = { + scenarios: [ + { + name: 'default', + dependencies: {} + }, + { + name: "release", + dependencies: { + "ember": "release" + } + }, + { + name: "beta", + dependencies: { + "ember": "beta" + } + }, + { + name: "canary", + dependencies: { + "ember": "canary" + } + } + ] +} diff --git a/package.json b/package.json index 3486b428..ec6ac9c6 100644 --- a/package.json +++ b/package.json @@ -19,25 +19,26 @@ "author": "", "license": "MIT", "devDependencies": { - "ember-cli": "^0.2.3", "broccoli-asset-rev": "^2.0.2", + "broccoli-sass": "0.6.5", + "ember-cli": "^0.2.3", "ember-cli-app-version": "0.3.3", + "ember-cli-autoprefixer": "^0.3.0", "ember-cli-babel": "5.0.0", + "ember-cli-coffeescript": "0.10.0", "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "0.0.8", + "ember-cli-document-title": "0.1.0", "ember-cli-htmlbars": "0.7.4", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", + "ember-cli-inline-images": "^0.0.4", + "ember-cli-pretender": "0.3.1", "ember-cli-qunit": "0.3.10", + "ember-cli-sauce": "^1.1.0", "ember-cli-uglify": "1.0.1", "ember-data": "1.0.0-beta.16.1", "ember-export-application-global": "^1.0.2", - "broccoli-sass": "0.6.5", - "ember-cli-autoprefixer": "^0.3.0", - "ember-cli-coffeescript": "0.10.0", - "ember-cli-document-title": "0.1.0", - "ember-cli-inline-images": "^0.0.4", - "ember-cli-pretender": "0.3.1", - "ember-cli-sauce": "^1.1.0" + "ember-try": "0.0.5" } }