-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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 beta] Fix addon linting regression. #5955
Conversation
LGTM! should this target the beta branch directly though? |
No clue. I think the pattern of merging from beta to master is bad, and therefore forcing all contributors to figure out what branch to target manually is poor contributor UX (and also not what we had collectively agreed upon as a group). If that has changed, then yes. If not, then no. 😈 |
@rwjblue I don't really have a horse in that race, I'm happy to do either. @Turbo87 was in favor of the merge strategy for reducing mistakes. (And he was generally operating under the assumption that the large majority of branch-targeted fixes would come from us.) Y'all have an offline conversation and let us know what the outcome is? Once decided update this thread and we'll figure it out. Also, GitHub should totally allow retargeting PRs. That's absurd that we can't do that (which solves the contributor UX issues). |
Ultimately, whomever is doing the work should decide. Lately, that isn't me. I just need to know what to do with fixes (like this one). |
the default is
we already had several things missing in master and beta due to incomplete cherry picks. that was fixed rather easily by merging those branches back in.
I think that sounds easier than it is. What you need to do is rebase those changes onto another branch, and only those changes in the PR, not the rest of the branch. If that rebase results in conflicts it also won't work. Thinking more about this, it might actually be possible for GitHub to implement something like that...
since the policy would be to merge
PR should only target beta/release if they are bugfixes for bugs in those releases. Since bugs are usually reported in an issue first we would have to figure out which releases are affected before doing the PR anyway.
you'd have the same "nasty rebase" if you backport from master to beta/release...
agreed, but I don't think this is raising the barrier in any significant way. contributors can still do bugfixes on master and we can backport them as we did before, but as mentioned above the core team should be aware of those other branches and target them as appropriate. finally... @homu r+ :) |
📌 Commit 9f470f2 has been approved by |
⚡ Test exempted - status |
[BUGFIX beta] Fix addon linting regression. This was originally fixed in #5592, but likely regressed during the "great core-object migration of 2016" (:smiling_imp:). #5498 contains a good description of why using `eachAddonInvoke` doesn't work and shows the reasoning behind `_eachProjectAddonInvoke`.
This was originally fixed in #5592, but likely regressed during the "great core-object migration of 2016" (:smiling_imp:). #5498 contains a good description of why using
eachAddonInvoke
doesn't work and shows the reasoning behind_eachProjectAddonInvoke
.