Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
17 changes: 11 additions & 6 deletions Formula/envoy.rb
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
26 changes: 13 additions & 13 deletions Formula/envoy@1.17.rb → Formula/envoy@1.18.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
class EnvoyAT117 < Formula
class EnvoyAT118 < 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.17.3",
revision: "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4"
tag: "v1.18.3",
revision: "98c1c9e9a40804b93b074badad1cdf284b47d58b"
license "Apache-2.0"

bottle do
sha256 cellar: :any_skip_relocation, big_sur: "e82ae3a1c65513df10b3db1a8e77d28cd213b694cd25d0e0c5315e7437269407"
sha256 cellar: :any_skip_relocation, catalina: "e5ad329ea6f0e29890db94a5fe57ba9be76bc9c033eda6a2e4f41e08a3f3311f"
end

keg_only :versioned_formula
# https://github.com/envoyproxy/envoy/blob/main/RELEASES.md#release-schedule
deprecate! date: "2022-01-11", because: :unsupported
deprecate! date: "2022-04-15", because: :unsupported

depends_on "automake" => :build
depends_on "bazelisk" => :build
Expand All @@ -24,15 +19,20 @@ class EnvoyAT117 < 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
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this isn't needed as it doesn't run envoy's unit tests

--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"
Expand Down
1 change: 1 addition & 0 deletions formula_renames.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"d-bus": "dbus",
"elasticsearch@6.8": "elasticsearch@6",
"elasticsearch@7.8": "elasticsearch@7",
"envoy@1.17": "envoy@1.18",
"fbida": "exiftran",
"fcct": "butane",
"ffmpeg28": "ffmpeg@2.8",
Expand Down