Skip to content

Commit c0f11b1

Browse files
authored
scripts: Use go install rather than gobin (#498)
Uses the built in `go install` that newer versions of Go have to install the Go binary dependencies that this project relies on. Signed-off-by: Marc Lopez Rubio <marc5.12@outlook.com>
1 parent 39dffee commit c0f11b1

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ issues:
33
max-same-issues: 0
44

55
linters:
6-
enable-all: true
76
disable:
87
- dupl
98
- lll

build/Makefile.deps

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,35 @@ OS:=$(shell uname -s | tr '[:upper:]' '[:lower:]')
44
ARCH:=$(shell $(PWD)/scripts/uname_arch.sh)
55
VERSION_DIR:=$(GOBIN)/versions
66

7-
VERSION_GOBIN:=v0.0.13
87
VERSION_GOLINT:=v0.0.0-20191125180803-fdd1cda4f05f
98
VERSION_GOLICENSER:=v0.3.0
10-
VERSION_GOLANGCILINT:=v1.23.8
9+
VERSION_GOLANGCILINT:=v1.38.0
1110
VERSION_GOBINDATA:=v0.0.0-20190711162640-ee3c2418e368
12-
VERSION_GORELEASER:=v0.136.0
11+
VERSION_GORELEASER:=v0.156.1
1312

14-
deps: $(GOBIN)/gobin $(GOBIN)/golint $(GOBIN)/go-licenser $(GOBIN)/golangci-lint $(GOBIN)/go-bindata $(GOBIN)/goreleaser
13+
deps: $(GOBIN)/golint $(GOBIN)/go-licenser $(GOBIN)/golangci-lint $(GOBIN)/go-bindata $(GOBIN)/goreleaser
1514

1615
$(GOBIN):
1716
@ mkdir -p $(GOBIN)
1817

1918
$(VERSION_DIR): | $(GOBIN)
2019
@ mkdir -p $(GOBIN)/versions
2120

22-
23-
$(VERSION_DIR)/.version-gobin-$(VERSION_GOBIN): | $(VERSION_DIR)
24-
@ rm -f $(VERSION_DIR)/.version-gobin-*
25-
@ echo $(VERSION_GOBIN) > $(VERSION_DIR)/.version-gobin-$(VERSION_GOBIN)
26-
27-
$(GOBIN)/gobin: $(VERSION_DIR)/.version-gobin-$(VERSION_GOBIN) | $(GOBIN)
28-
@ echo "-> Installing gobin..."
29-
@ curl -sL -o $(GOBIN)/gobin https://github.com/myitcv/gobin/releases/download/$(VERSION_GOBIN)/$(OS)-$(ARCH)
30-
@ chmod +x $(GOBIN)/gobin
31-
3221
$(VERSION_DIR)/.version-golint-$(VERSION_GOLINT): | $(VERSION_DIR)
3322
@ rm -f $(VERSION_DIR)/.version-golint-*
3423
@ echo $(VERSION_GOLINT) > $(VERSION_DIR)/.version-golint-$(VERSION_GOLINT)
3524

36-
$(GOBIN)/golint: $(GOBIN)/gobin $(VERSION_DIR)/.version-golint-$(VERSION_GOLINT) | $(GOBIN)
25+
$(GOBIN)/golint: $(VERSION_DIR)/.version-golint-$(VERSION_GOLINT) | $(GOBIN)
3726
@ echo "-> Installing golint..."
38-
@ $(GOBIN)/gobin golang.org/x/lint/golint@$(VERSION_GOLINT)
27+
@ go install golang.org/x/lint/golint@$(VERSION_GOLINT)
3928

4029
$(VERSION_DIR)/.version-go-licenser-$(VERSION_GOLICENSER): | $(VERSION_DIR)
4130
@ rm -f $(VERSION_DIR)/.version-go-licenser-*
4231
@ echo $(VERSION_GOLICENSER) > $(VERSION_DIR)/.version-go-licenser-$(VERSION_GOLICENSER)
4332

44-
$(GOBIN)/go-licenser: $(GOBIN)/gobin $(VERSION_DIR)/.version-go-licenser-$(VERSION_GOLICENSER) | $(GOBIN)
33+
$(GOBIN)/go-licenser: $(VERSION_DIR)/.version-go-licenser-$(VERSION_GOLICENSER) | $(GOBIN)
4534
@ echo "-> Installing go-licenser..."
46-
@ $(GOBIN)/gobin github.com/elastic/go-licenser@$(VERSION_GOLICENSER)
35+
@ go install github.com/elastic/go-licenser@$(VERSION_GOLICENSER)
4736

4837
$(VERSION_DIR)/.version-golangci-lint-$(VERSION_GOLANGCILINT): | $(VERSION_DIR)
4938
@ rm -f $(VERSION_DIR)/.version-golangci-lint-*
@@ -57,9 +46,9 @@ $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA):
5746
@ rm -f $(VERSION_DIR)/.version-go-bindata-*
5847
@ echo $(VERSION_GOBINDATA) > $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA)
5948

60-
$(GOBIN)/go-bindata: $(GOBIN)/gobin $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA) | $(GOBIN)
49+
$(GOBIN)/go-bindata: $(VERSION_DIR)/.version-go-bindata-$(VERSION_GOBINDATA) | $(GOBIN)
6150
@ echo "-> Installing go-bindata..."
62-
@ $(GOBIN)/gobin github.com/go-bindata/go-bindata/go-bindata@$(VERSION_GOBINDATA)
51+
@ go install github.com/go-bindata/go-bindata/go-bindata@$(VERSION_GOBINDATA)
6352

6453
$(VERSION_DIR)/.version-goreleaser-$(VERSION_GORELEASER): | $(VERSION_DIR)
6554
@ rm -f $(VERSION_DIR)/.version-goreleaser-*

0 commit comments

Comments
 (0)