Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary #9311

Merged
merged 2 commits into from
Oct 14, 2014

Conversation

jayphelps
Copy link
Contributor

See discussion below.
Fixes #9309 (comment)

Cc/ @rwjblue, @igorT

@jayphelps jayphelps changed the title [BUGFIX] Exclude as a possible FEATURES key for warnings [BUGFIX] Exclude isEnabled as a possible FEATURES key for warnings Oct 13, 2014
@igorT
Copy link
Member

igorT commented Oct 13, 2014

re: my comment I am running a canary build and still see the isEnabled warning

@jayphelps
Copy link
Contributor Author

@igorT ...shit shit... Okiedoke. Gimmie a bit.

@jayphelps
Copy link
Contributor Author

@rwjblue ahh. so the issue is https://github.com/emberjs/ember.js/pull/9309/files#diff-f5a9575f74b90dcc366c4a161d779d16R196 is stripped, even in canary builds because duh, I didn't set it in the features.json. I don't really think it belongs in there, so I assume the only other place would be in the Brocfile...which is still hacky but that's the best I've got if we use this method of detection. Looking at the code more, I can't figure out how this could be done without maintaining a change to the master Brocfile but never merging it into the other branches.

Gonna have to defer to Robert on the best course of action since he knows the build process far better than anyone..

@jayphelps jayphelps changed the title [BUGFIX] Exclude isEnabled as a possible FEATURES key for warnings [WIP BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary Oct 13, 2014
@rwjblue
Copy link
Member

rwjblue commented Oct 13, 2014

@jayphelps - Add it to features.json with a null value. All null features are set to false as part of the canary to beta branching process.

… features.json so it isn't stripped in canary
@jayphelps jayphelps changed the title [WIP BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary [BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary Oct 13, 2014
@jayphelps
Copy link
Contributor Author

@rwjblue Done. lmk.

ping

rwjblue added a commit that referenced this pull request Oct 14, 2014
[BUGFIX] Canary FEATURES flagging shouldn't produce warnings in canary
@rwjblue rwjblue merged commit 2178406 into emberjs:master Oct 14, 2014
@rwjblue
Copy link
Member

rwjblue commented Oct 14, 2014

LGTM, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants