[BUGFIX beta] Bump Ember & Ember Data version to 2.6.0-beta #5859
Conversation
|
I thought we decided to stay on the stable versions? |
|
I discussed with @stefanpenner a few days ago about it. It is possible that I misunderstood, but since ember-cli@2.6.0 will install ember@2.6.0 it seems reasonable that using the betas of ember-cli@2.6 would also use the beta versions of Ember. |
|
does that mean that our canary should also use ember canary? |
|
In theory yes, but Ember canary is a bit too unstable at the moment (due to all the work being done on glimmer2) so I think we should stick to tagged releases. |
|
shouldn't this PR target |
|
@Turbo87 - All changes to beta go through master first, and are then cherry-picked into beta. Otherwise it is very easy for the two to get out of sync. |
rwjblue
changed the title
|
hmm okay... the way I've usually worked in most other projects is regularly merging |
|
@Turbo87 - Due to our train model where all changes flow from canary down into the final release, we need to ensure that changes also follow the same pattern. In this case, I made a mistake when doing the initial 2.6.0-beta.1 release as these changes should have been included there to begin with (and no cherry-picking or merging would have been needed). In most other cases, we want the fixes to land on canary so they can be tested by those brave souls running canary before rolling things into beta or release branches. |
|
I'm happy to discuss a different pattern for doing these sorts of things going forward, but I'd like to land this for now.... |
|
@homu r+ |
|
📌 Commit bdb45d1 has been approved by |
|
⚡ Test exempted - status |
[BUGFIX beta] Bump Ember & Ember Data version to 2.6.0-beta None
sure, I didn't intend to block this. was just curious :) |
No description provided.