envoy 1.21.0

Closes #90921.

Signed-off-by: Sean Molenaar <1484494+SMillerDev@users.noreply.github.com>
Signed-off-by: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com>
master
Xuehai Pan 2021-12-10 23:26:41 +08:00 committed by BrewTestBot
parent ddc4ee01ea
commit c28e8b123f
No known key found for this signature in database
GPG Key ID: 82D7D104050B0F0F
3 changed files with 10 additions and 5 deletions

View File

@ -1 +0,0 @@
../Formula/envoy.rb

View File

@ -4,8 +4,8 @@ class Envoy < Formula
# Switch to a tarball when the following issue is resolved: # Switch to a tarball when the following issue is resolved:
# https://github.com/envoyproxy/envoy/issues/2181 # https://github.com/envoyproxy/envoy/issues/2181
url "https://github.com/envoyproxy/envoy.git", url "https://github.com/envoyproxy/envoy.git",
tag: "v1.20.1", tag: "v1.21.0",
revision: "ea23f47b27464794980c05ab290a3b73d801405e" revision: "a9d72603c68da3a10a1c0d021d01c7877e6f2a30"
license "Apache-2.0" license "Apache-2.0"
head "https://github.com/envoyproxy/envoy.git", branch: "main" head "https://github.com/envoyproxy/envoy.git", branch: "main"
@ -31,7 +31,7 @@ class Envoy < Formula
# GCC added as a test dependency to work around Homebrew issue. Otherwise `brew test` fails. # GCC added as a test dependency to work around Homebrew issue. Otherwise `brew test` fails.
# CompilerSelectionError: envoy cannot be built with any available compilers. # CompilerSelectionError: envoy cannot be built with any available compilers.
depends_on "gcc@9" => [:build, :test] depends_on "gcc@9" => [:build, :test]
depends_on "python@3.9" => :build depends_on "python@3.10" => :build
end end
# https://github.com/envoyproxy/envoy/tree/main/bazel#supported-compiler-versions # https://github.com/envoyproxy/envoy/tree/main/bazel#supported-compiler-versions
@ -49,7 +49,7 @@ class Envoy < Formula
env_path = if OS.mac? env_path = if OS.mac?
"#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin" "#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin"
else else
"#{Formula["python@3.9"].opt_libexec}/bin:#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin" "#{Formula["python@3.10"].opt_bin}:#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin"
end end
args = %W[ args = %W[
--compilation_mode=opt --compilation_mode=opt
@ -60,6 +60,12 @@ class Envoy < Formula
--host_action_env=PATH=#{env_path} --host_action_env=PATH=#{env_path}
] ]
if OS.linux?
# Disable extension `tcp_stats` which requires Linux headers >= 4.6
# It's a directive with absolute path `#include </usr/include/linux/tcp.h>`
args << "--//source/extensions/transport_sockets/tcp_stats:enabled=false"
end
system Formula["bazelisk"].opt_bin/"bazelisk", "build", *args, "//source/exe:envoy-static" system Formula["bazelisk"].opt_bin/"bazelisk", "build", *args, "//source/exe:envoy-static"
bin.install "bazel-bin/source/exe/envoy-static" => "envoy" bin.install "bazel-bin/source/exe/envoy-static" => "envoy"
pkgshare.install "configs", "examples" pkgshare.install "configs", "examples"