Juju 2.7.0

The following changes the revision from 2.6.10 to 2.7.0

Remove the 2.6.x work around for Catalina

Closes #47291.

Signed-off-by: Rui Chen <chenrui333@gmail.com>
This commit is contained in:
Simon Richardson 2019-11-28 15:14:02 +00:00 committed by Rui Chen
parent 2afcb8dba5
commit 6fe3011e86

View file

@ -1,8 +1,8 @@
class Juju < Formula
desc "DevOps management tool"
homepage "https://jujucharms.com/"
url "https://launchpad.net/juju/2.6/2.6.10/+download/juju-core_2.6.10.tar.gz"
sha256 "d781b733dd7a4e74ef0e9f88527a74a4bea0298e56f4dcaa6dd1cf62c2c40f2b"
url "https://launchpad.net/juju/2.7/2.7.0/+download/juju-core_2.7.0.tar.gz"
sha256 "eb3bbec34a99923c4b2fb0c89f43dda78f8ab03fbb42ef725fdc1311eded7826"
bottle do
cellar :any_skip_relocation
@ -14,13 +14,6 @@ class Juju < Formula
depends_on "go" => :build
def install
# Fix for Catalina
# Backport of https://github.com/juju/juju/pull/10775 and https://github.com/juju/os/pull/14
# Remove in 2.7
inreplace Dir["src/github.com/juju/juju/vendor/github.com/juju/{utils,os}/series/series.go"],
"var macOSXSeries = map[int]string{",
"var macOSXSeries = map[int]string{\n\t19: \"catalina\","
ENV["GOPATH"] = buildpath
system "go", "build", "github.com/juju/juju/cmd/juju"
system "go", "build", "github.com/juju/juju/cmd/plugins/juju-metadata"