Skip to content

PHP: Fix include path for boringssl in windows build#22994

Merged
stanley-cheung merged 1 commit intogrpc:masterfrom
stanley-cheung:php-fix-windows-upmerge
May 20, 2020
Merged

PHP: Fix include path for boringssl in windows build#22994
stanley-cheung merged 1 commit intogrpc:masterfrom
stanley-cheung:php-fix-windows-upmerge

Conversation

@stanley-cheung
Copy link
Copy Markdown
Contributor

This is the same fix as #22274.

Apparently changes from v1.28.x hasn't been upmerged back to master, so I need this fix to merge to master too.

I will probably attempt to do an upmerge from v1.28.x and v1.29.x to see if we are missing anything else.

@stanley-cheung stanley-cheung added lang/php release notes: no Indicates if PR should not be in release notes labels May 19, 2020
@stanley-cheung stanley-cheung requested a review from apolcyn May 19, 2020 23:08
@stanley-cheung
Copy link
Copy Markdown
Contributor Author

stanley-cheung commented May 19, 2020

Flake: #22399

@stanley-cheung stanley-cheung merged commit fffea57 into grpc:master May 20, 2020
@stanley-cheung stanley-cheung deleted the php-fix-windows-upmerge branch May 20, 2020 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lang/php release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants