search

JaneaSystems / nodejs-mobile

Full-fledged Node.js on Android and iOS
https://code.janeasystems.com/nodejs-mobile
Other
2.58k stars 182 forks source link

Node 9 rebase #45

Open avaer opened 6 years ago

avaer commented 6 years ago

Upstream node-chakracore is on 9.4.0, and we're on 8.6.0 here. At some point we need to sync up with that,

I wanted to pull down the changes myself but it wasn't a clean merge. To that end would it make sense to maintain a patchset rebased on top of node-chakracore for easier future consumption of upstream changes?

jaimecbernardo commented 6 years ago

Hi @modulesio , thank you for the issue.

We are currently focused on maintaining changes from upstream node-chakracore releases only, and for LTS versions, so the next planned merge is for the recently released node-chakracore version 8.9.4. The current workflow we've been using is by using merge commits to bring in the changes from upstream.

In terms of the suggestion, I'm not sure what you mean. Even as a patchset, some of the changes wouldn't land cleanly with some of the code changes upstream, and I'm not sure how that would look in terms of the commit history. It sounds like rewriting history in the repo every time changes are brought.

We're open to contributions and such a workflow could be kept on a different branch, if there is interest on pursuing this endeavor.

avaer commented 6 years ago

Thanks for the clarification!

I actually just wanted to see what's necessary for consuming Current from node-chakracore (i.e. master, which currently seems to be up to 9.4.0). If the goal is not to support node Current (yet?), but only LTS, then this makes sense, especially since node-chakracore is not making Current releases either.

You were correct that I was suggesting floating a rebased Current patchset, but it would be nasty for commit history.

That said, I'd be interested in getting upstream Current working in this repo somehow (i.e. node-chakracore master). Do you think there is any sense in trying?

jaimecbernardo commented 6 years ago

Sure, if it's necessary for your needs, it may be worth a try.

I've just updated this repo's node-chakracore-master branch to the current master branch of upstream node-chakracore. If you want to give it a try, you can open a PR to node-chakracore-master and we can then accept it into a new branch, something like mobile-v9.x. Does this sound good?