Skip to content

Commit

Permalink
envoy 1.21.0
Browse files Browse the repository at this point in the history
Closes #90921.

Signed-off-by: Sean Molenaar <[email protected]>
Signed-off-by: BrewTestBot <[email protected]>
  • Loading branch information
XuehaiPan authored and BrewTestBot committed Jan 20, 2022
1 parent ddc4ee0 commit c28e8b1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
1 change: 0 additions & 1 deletion Aliases/[email protected]

This file was deleted.

File renamed without changes.
14 changes: 10 additions & 4 deletions Formula/envoy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ class Envoy < Formula
# Switch to a tarball when the following issue is resolved:
# https://github.com/envoyproxy/envoy/issues/2181
url "https://github.com/envoyproxy/envoy.git",
tag: "v1.20.1",
revision: "ea23f47b27464794980c05ab290a3b73d801405e"
tag: "v1.21.0",
revision: "a9d72603c68da3a10a1c0d021d01c7877e6f2a30"
license "Apache-2.0"
head "https://github.com/envoyproxy/envoy.git", branch: "main"

Expand All @@ -31,7 +31,7 @@ class Envoy < Formula
# GCC added as a test dependency to work around Homebrew issue. Otherwise `brew test` fails.
# CompilerSelectionError: envoy cannot be built with any available compilers.
depends_on "gcc@9" => [:build, :test]
depends_on "python@3.9" => :build
depends_on "python@3.10" => :build
end

# https://github.com/envoyproxy/envoy/tree/main/bazel#supported-compiler-versions
Expand All @@ -49,7 +49,7 @@ def install
env_path = if OS.mac?
"#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin"
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
args = %W[
--compilation_mode=opt
Expand All @@ -60,6 +60,12 @@ def install
--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"
bin.install "bazel-bin/source/exe/envoy-static" => "envoy"
pkgshare.install "configs", "examples"
Expand Down

0 comments on commit c28e8b1

Please sign in to comment.