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

fix: switch to mojo proxy resolver (3-1-x) #15813

Merged
merged 6 commits into from Nov 26, 2018

Conversation

deepak1556
Copy link
Member

@deepak1556 deepak1556 commented Nov 23, 2018

Description of Change

The first commit is direct backport with only gyp specific changes, the second commit gets the patches made in libcc and the last commit updates api for Chromium 66 since the original PR was agains Chromium 69.

Backports #14656

Depends on electron/libchromiumcontent#705

Fixes #13829

Checklist

  • PR description included and stakeholders cc'd
  • npm test passes
  • tests are changed or added
  • relevant documentation is changed or added
  • PR title follows semantic commit guidelines

Release Notes

Notes: Switch to mojo proxy resolver

@deepak1556 deepak1556 requested review from a team November 23, 2018 09:48
@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from db9e360 to 47c9ab1 Compare November 23, 2018 10:12
@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 0608c39 to 1001f26 Compare November 26, 2018 11:20
@deepak1556 deepak1556 requested a review from a team November 26, 2018 11:20
@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 1001f26 to 9a9b382 Compare November 26, 2018 11:38
@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 9a9b382 to 830c57b Compare November 26, 2018 14:33
@jkleinsc jkleinsc changed the base branch from 3-0-x to 3-1-x November 26, 2018 17:59
@felixrieseberg
Copy link
Member

@deepak1556 I'll go ahead and rebase this onto 3-1-x.

@deepak1556
Copy link
Member Author

@felixrieseberg thanks!

Copy link
Member

@felixrieseberg felixrieseberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving, given that most of this code is already in 4-0-x.

@jkleinsc jkleinsc changed the title fix: switch to mojo proxy resolver (3-0-x) fix: switch to mojo proxy resolver (3-1-x) Nov 26, 2018
@BinaryMuse
Copy link
Contributor

CircleCI is failing on the login item API, which is a known flake. Merging.

@BinaryMuse BinaryMuse merged commit 4abf558 into 3-1-x Nov 26, 2018
@release-clerk
Copy link

release-clerk bot commented Nov 26, 2018

Release Notes Persisted

Switch to mojo proxy resolver

@BinaryMuse BinaryMuse deleted the backport_14656_mojo_proxy_resolver branch November 26, 2018 23:40
@sofianguy sofianguy added this to Fixed (3.1.0-beta.1) in 3.0.x / 3.1.x Dec 4, 2018
@sofianguy sofianguy added this to Fixed in 3.1.0-beta.1 in 3.1.x Jan 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
3.1.x
Fixed in 3.1.0-beta.1
Development

Successfully merging this pull request may close these issues.

None yet

4 participants