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

quiche: patch for MacOS build #19360

Merged
merged 4 commits into from
Dec 28, 2021
Merged

quiche: patch for MacOS build #19360

merged 4 commits into from
Dec 28, 2021

Conversation

junr03
Copy link
Member

@junr03 junr03 commented Dec 28, 2021

Signed-off-by: Jose Nino jnino@lyft.com

quiche: patch for MacOS build
b64d023 
Signed-off-by: Jose Nino <jnino@lyft.com>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Dec 28, 2021
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @moderation

🐱

Caused by: #19360 was opened by junr03.

see: more, trace.

Jose Nino added 3 commits December 28, 2021 10:48
patch args
f1f9190 
Signed-off-by: Jose Nino <jnino@lyft.com>
correct way
97a6dfd 
Signed-off-by: Jose Nino <jnino@lyft.com>
patch
5768ebd 
Signed-off-by: Jose Nino <jnino@lyft.com>
@junr03 junr03 assigned htuch and RyanTheOptimist and unassigned moderation Dec 28, 2021
@junr03
Copy link
Member Author

junr03 commented Dec 28, 2021

@RyanTheOptimist @htuch I found this type constraint error when updating Envoy in Envoy Mobile. I'll work on a quiche upstream patch to remove the local patch here. However, for the time being it would be nice to patch locally in order to unblock bringing Envoy into Envoy Mobile.

RyanTheOptimist
RyanTheOptimist approved these changes Dec 28, 2021
View reviewed changes
Copy link
Contributor

@RyanTheOptimist RyanTheOptimist left a comment

Choose a reason for hiding this comment

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

LGTM

@birenroy can you backport this fix? I wonder if we're building this on chromium, which also has a mac OS build

@junr03
Copy link
Member Author

junr03 commented Dec 28, 2021

I'll work on a quiche upstream patch to remove the local patch here

Awesome @RyanTheOptimist if @birenroy can help us with that I will sight tight :)

@RyanTheOptimist
Copy link
Contributor

I'll work on a quiche upstream patch to remove the local patch here

Awesome @RyanTheOptimist if @birenroy can help us with that I will sight tight :)

Yeah, the actual source of truth for quiche is a google-internal repo so a Googler will have to land the fix at the end of the day. Hopefully one day we'll move to an open-source-first model for quiche!

@htuch
Copy link
Member

htuch commented Dec 28, 2021

/lgtm deps

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Dec 28, 2021
@junr03
Copy link
Member Author

junr03 commented Dec 28, 2021

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Check envoy-presubmit isn't fully completed, but will still attempt retrying.
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #19360 (comment) was created by @junr03.

see: more, trace.

@junr03
Copy link
Member Author

junr03 commented Dec 28, 2021

/retest

@repokitteh-read-only
Copy link

Retrying Azure Pipelines:
Retried failed jobs in: envoy-presubmit

🐱

Caused by: a #19360 (comment) was created by @junr03.

see: more, trace.

@junr03 junr03 merged commit 8a75ac1 into main Dec 28, 2021
@junr03 junr03 mentioned this pull request Dec 28, 2021
Merged
This was referenced Jan 5, 2022
Merged
Closed
copybara-service bot pushed a commit to google/quiche that referenced this pull request Jan 6, 2022
@copybara-github
Adds integer type casts to fix builds on MacOS.
b0fda33 
Fixes issues reported in pull requests:
  envoyproxy/envoy#19360
  envoyproxy/envoy#19408

PiperOrigin-RevId: 419931794
RyanTheOptimist pushed a commit that referenced this pull request Jan 6, 2022
@jpsim
quiche: fix macOS build (#19408)
76c7b3b 
quiche: patch for macOS build

The patch from #19360 and other similar implicit type cast fixes have now landed upstream in quiche, so this PR bumps quiche to b0fda33 and deletes the local patch as it is no longer needed.

Changes: google/quiche@c8c21d0...b0fda33

Signed-off-by: JP Simard <jp@jpsim.com>
@junr03 junr03 deleted the quiche-patch branch January 11, 2022 18:41
joshperry pushed a commit to joshperry/envoy that referenced this pull request Feb 13, 2022
@junr03
quiche: patch for MacOS build (envoyproxy#19360)
79fef2a 
Signed-off-by: Jose Nino <jnino@lyft.com>
Signed-off-by: Josh Perry <josh.perry@mx.com>
joshperry pushed a commit to joshperry/envoy that referenced this pull request Feb 13, 2022
@jpsim
quiche: fix macOS build (envoyproxy#19408)
b8a3c64 
quiche: patch for macOS build

The patch from envoyproxy#19360 and other similar implicit type cast fixes have now landed upstream in quiche, so this PR bumps quiche to b0fda33 and deletes the local patch as it is no longer needed.

Changes: google/quiche@c8c21d0...b0fda33

Signed-off-by: JP Simard <jp@jpsim.com>
Signed-off-by: Josh Perry <josh.perry@mx.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RyanTheOptimist RyanTheOptimist RyanTheOptimist approved these changes

Assignees

@htuch htuch

@RyanTheOptimist RyanTheOptimist

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@junr03 @RyanTheOptimist @htuch @moderation