Skip to content

Commit 521cac7

Browse files
author
Quentin Perez
committed
fix homebrew formula
1 parent d248b05 commit 521cac7

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PACKAGES := $(shell go list ./... | grep -v /vendor/ | grep -v /cmd/)
3333
REL_COMMANDS := $(subst $(GODIR),./,$(COMMANDS))
3434
REL_PACKAGES := $(subst $(GODIR),./,$(PACKAGES))
3535
VERSION = $(shell cat .goxc.json | grep "PackageVersion" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
36-
REV = $(shell git rev-parse HEAD || git ls-remote https://github.com/scaleway/scaleway-cli | grep -F $(VERSION) | head -n1 | awk '{print $$1}' || echo "nogit")
36+
REV = $(shell git rev-parse HEAD || echo "nogit")
3737
TAG = $(shell git describe --tags --always || echo $(VERSION) || echo "nogit")
3838
LDFLAGS = "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=$(REV) \
3939
-X github.com/scaleway/scaleway-cli/pkg/scwversion.VERSION=$(TAG)"

contrib/builder/homebrew/scw.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ class Scw < Formula
1010

1111
depends_on "go" => :build
1212

13-
go_resource "github.com/Sirupsen/logrus" do
14-
url "https://github.com/Sirupsen/logrus.git", revision: "f7f79f729e0fbe2fcc061db48a9ba0263f588252"
15-
end
16-
1713
def install
1814
ENV["GOPATH"] = buildpath
1915
ENV["CGO_ENABLED"] = "0"
@@ -24,8 +20,7 @@ def install
2420
ln_s buildpath, buildpath/"src/github.com/scaleway/scaleway-cli"
2521
Language::Go.stage_deps resources, buildpath/"src"
2622

27-
version = `cat .goxc.json | grep "PackageVersion" | egrep -o "([0-9]{1,}\.)+[0-9]{1,}"`
28-
system "go", "build", "-ldflags", "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=homebrew -X github.com/scaleway/scaleway-cli/pkg/scwversion.VERSION=#{version}", "./cmd/scw"
23+
system "go", "build", "-ldflags", "-X github.com/scaleway/scaleway-cli/pkg/scwversion.GITCOMMIT=homebrew", "./cmd/scw"
2924
bin.install "scw"
3025

3126
bash_completion.install "contrib/completion/bash/scw"

0 commit comments

Comments
 (0)