Skip to content

macos build: Fix ninja install#14495

Merged
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
sunjayBhatia:macos-failure
Dec 21, 2020
Merged

macos build: Fix ninja install#14495
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
sunjayBhatia:macos-failure

Conversation

@sunjayBhatia
Copy link
Member

@sunjayBhatia sunjayBhatia commented Dec 21, 2020

Commit Message:
macos build: Fix ninja install

Additional Description: N/A
Risk Level: Low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

@sunjayBhatia sunjayBhatia force-pushed the macos-failure branch 2 times, most recently from 04ce329 to aec5588 Compare December 21, 2020 19:41
@mattklein123 mattklein123 self-assigned this Dec 21, 2020
- python@3.9 (dependency of ninja) 2to3 tool conflicting with system python
- remove 2to3 if exists
- remove now unneeded openssl workaround

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
@sunjayBhatia sunjayBhatia marked this pull request as ready for review December 21, 2020 20:56
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Awesome, thanks!

@mattklein123 mattklein123 merged commit 741f5fa into envoyproxy:master Dec 21, 2020
@sunjayBhatia sunjayBhatia deleted the macos-failure branch December 21, 2020 21:08
mpuncel added a commit to mpuncel/envoy that referenced this pull request Dec 22, 2020
* master: (30 commits)
  Deflaked: Guarddog_impl_test (envoyproxy#14475)
  [fuzz] add fuzz tests for hpack encoding and decoding (envoyproxy#13315)
  [filters] Prevent a filter from sending local reply and continue (envoyproxy#14416)
  oauth2: improving coverage (envoyproxy#14479)
  owners: Change dio email address (envoyproxy#14498)
  macos build: Fix ninja install (envoyproxy#14495)
  http: use OptRef helper to reduce some boilerplate (envoyproxy#14361)
  doc: update test/integration/README.md (envoyproxy#14485)
  server: wait workers to start before draining parent. (envoyproxy#14319)
  api: relax inline_string length limitation in DataSource (envoyproxy#14461)
  oauth: properly stop filter chain when a response was sent (envoyproxy#14476)
  listener: deprecate use_proxy_proto (envoyproxy#14406)
  deps: update cel and remove a patch (envoyproxy#14473)
  preconnect: rename: (envoyproxy#14474)
  coverage: ratcheting limits (envoyproxy#14472)
  grpc mux: fix sending node again after stream is reset (envoyproxy#14080)
  [test] Replace printers_include with printers_lib. (envoyproxy#14442)
  tcp: nodelay in the new pool (envoyproxy#14453)
  test: replace mock_methodn macros with mock_method (envoyproxy#14450)
  tcp: extending tcp integration test (envoyproxy#14451)
  ...

Signed-off-by: Michael Puncel <mpuncel@squareup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants