Skip to content

Commit

Permalink
Merge pull request #14 from dollarshaveclub/fix-glimmer-2-logic
Browse files Browse the repository at this point in the history
[fix] Correct logic for pushing app-lt-2-10 tree
  • Loading branch information
rwjblue authored Nov 10, 2016
2 parents a01b6a1 + e5e1a8f commit a2693bf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@ module.exports = {
name: 'default',
dependencies: { }
},
{
name: 'ember 2.9.0-beta.5',
dependencies: {
'ember': '2.9.0-beta.5'
}
},
{
name: 'ember 2.9.0',
dependencies: {
'ember': '2.9.0'
}
},
{
name: 'ember 2.10.0-beta.1',
dependencies: {
'ember': '2.10.0-beta.1'
}
},
{
name: 'ember-release',
dependencies: {
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = {

// 2.9.0-beta.1 - 2.9.0-beta.5 used glimmer2 (but 2.9.0 did not)
// 2.10.0-beta.1+ includes glimmer2
if ((emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) || emberVersion.gt('2.10.0-beta')) {
if (!(emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) && !emberVersion.gt('2.10.0-beta')) {
trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
}

Expand Down

0 comments on commit a2693bf

Please sign in to comment.