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

4 participants
@deepak1556
Member

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 electron/docs as code owners Nov 23, 2018

@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from db9e360 to 47c9ab1 Nov 23, 2018

@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 0608c39 to 1001f26 Nov 26, 2018

@deepak1556 deepak1556 requested a review from electron/browserview as a code owner Nov 26, 2018

@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 1001f26 to 9a9b382 Nov 26, 2018

@deepak1556 deepak1556 force-pushed the backport_14656_mojo_proxy_resolver branch from 9a9b382 to 830c57b Nov 26, 2018

@jkleinsc jkleinsc changed the base branch from 3-0-x to 3-1-x Nov 26, 2018

@felixrieseberg

This comment has been minimized.

Member

felixrieseberg commented Nov 26, 2018

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

@deepak1556

This comment has been minimized.

Member

deepak1556 commented Nov 26, 2018

@felixrieseberg thanks!

@felixrieseberg

felixrieseberg approved these changes Nov 26, 2018 edited

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

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

@BinaryMuse

This comment has been minimized.

Member

BinaryMuse commented Nov 26, 2018

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

17 of 18 checks passed

ci/circleci: electron-mas-x64 Your tests failed on CircleCI
Details
Absolute Zero
Semantic Pull Request ready to be squashed
Details
WIP Legacy commit status override — see details
Details
appveyor: win-ia32-debug AppVeyor build succeeded
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-debug AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
ci/circleci: electron-osx-x64 Your tests passed on CircleCI!
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

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 Nov 26, 2018

@sofianguy sofianguy added this to Fixed (3.1.0-beta.1) in 3.0.x Dec 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment