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.

Sign up for GitHub

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

Jump to bottom

Electron 3 node 10 #4753

Closed
wants to merge 5 commits into from
Closed

Electron 3 node 10 #4753

wants to merge 5 commits into from

Conversation

debovema
Copy link
Contributor

Rebased and updated Node version to 10 in Appveyor & Travis CI config files.

@benoitf
Copy link
Contributor

benoitf commented Mar 28, 2019

hello @debovema you should rebase your PR, it includes commits from master there

@debovema
Copy link
Contributor Author

Thanks @benoitf. I did a proper rebase from master since @thegecko did rebase from master but new commits came along.
If I am not mistaken conflicting files between debovema:electron-3-node-10 and theia-ide:electron-3 will resolve conflicts between theia-ide:electron-3 and theia-ide:master.

thegecko and others added 5 commits March 28, 2019 17:07
@thegecko @debovema
Update electron and node packages
35d4c0e 
Signed-off-by: Rob Moran <rob.moran@arm.com>

Fix node 10 AddressInfo type change

Signed-off-by: Rob Moran <rob.moran@arm.com>

Fix electron scroll options change

Signed-off-by: Rob Moran <rob.moran@arm.com>
@debovema
Bump Electron 3 version
b5b8dc4 
Signed-off-by: Mathieu Debove <debovemathieu@gmail.com>
@thegecko @debovema
Update yarn.lock
58300c7 
Signed-off-by: Rob Moran <rob.moran@arm.com>
@thegecko @debovema
Updated CHANGELOG
026bc2a 
Signed-off-by: Rob Moran <rob.moran@arm.com>
@debovema
Rebase and bump Appveyor and Travis CI to Node 10
76d3c40 
Signed-off-by: Mathieu Debove <debovemathieu@gmail.com>
@benoitf
Copy link
Contributor

benoitf commented Mar 28, 2019

@debovema hmm ok didn't see you were providing a PR for a custom branch

@debovema
Copy link
Contributor Author

Nevermind I see that @thegecko has updated the Node version in #4750.
Rebase from master can be performed on this branch directly as master is moving fast right now.

@debovema debovema closed this Mar 28, 2019
@debovema debovema deleted the electron-3-node-10 branch March 28, 2019 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benoitf benoitf Awaiting requested review from benoitf

@evidolob evidolob Awaiting requested review from evidolob

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@debovema @benoitf @thegecko