From 02a017cc9b608b78e1aeca9b00ad5b5eecee19c9 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 19 Jul 2021 13:24:12 +1000 Subject: [PATCH] envoy 1.19.0 Closes #81490. Signed-off-by: Adrian Cole Co-authored-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Signed-off-by: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> --- Aliases/envoy@1.19 | 1 + Formula/envoy.rb | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 120000 Aliases/envoy@1.19 diff --git a/Aliases/envoy@1.19 b/Aliases/envoy@1.19 new file mode 120000 index 00000000000..81671960982 --- /dev/null +++ b/Aliases/envoy@1.19 @@ -0,0 +1 @@ +../Formula/envoy.rb \ No newline at end of file diff --git a/Formula/envoy.rb b/Formula/envoy.rb index d28dd20d722..4ae7dd046cc 100644 --- a/Formula/envoy.rb +++ b/Formula/envoy.rb @@ -1,9 +1,9 @@ class Envoy < Formula desc "Cloud-native high-performance edge/middle/service proxy" - homepage "https://www.envoyproxy.io" + homepage "https://www.envoyproxy.io/index.html" url "https://github.com/envoyproxy/envoy.git", - tag: "v1.18.3", - revision: "98c1c9e9a40804b93b074badad1cdf284b47d58b" + tag: "v1.19.0", + revision: "68fe53a889416fd8570506232052b06f5a531541" license "Apache-2.0" bottle do @@ -21,15 +21,20 @@ class Envoy < Formula depends_on "ninja" => :build depends_on macos: :catalina + # Work around xcode 12 incompatibility until envoyproxy/envoy#17393 + patch do + url "https://github.com/envoyproxy/envoy/commit/3b49166dc0841b045799e2c37bdf1ca9de98d5b1.patch?full_index=1" + sha256 "e65fe24a29795606ea40aaa675c68751687e72911b737201e9714613b62b0f02" + end + def install - args = %w[ + args = %W[ -c opt --curses=no --show_task_finish --verbose_failures - --action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin - --test_output=all + --action_env=PATH=#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin ] system Formula["bazelisk"].opt_bin/"bazelisk", "build", *args, "//source/exe:envoy-static" bin.install "bazel-bin/source/exe/envoy-static" => "envoy"