Merge pull request #3521 from cfromknecht/make-no-update
Makefile: remove -u when installing go-acc, consolidate dep installation
This commit is contained in:
commit
baa235c240
16
Makefile
16
Makefile
@ -4,7 +4,7 @@ MOBILE_PKG := $(PKG)/mobile
|
||||
|
||||
BTCD_PKG := github.com/btcsuite/btcd
|
||||
GOVERALLS_PKG := github.com/mattn/goveralls
|
||||
LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.18.0
|
||||
LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
|
||||
GOACC_PKG := github.com/ory/go-acc
|
||||
|
||||
GO_BIN := ${GOPATH}/bin
|
||||
@ -30,8 +30,10 @@ BTCD_COMMIT := $(shell cat go.mod | \
|
||||
awk -F " " '{ print $$2 }' | \
|
||||
awk -F "/" '{ print $$1 }')
|
||||
|
||||
LINT_COMMIT := v1.18.0
|
||||
GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
|
||||
|
||||
DEPGET := cd /tmp && GO111MODULE=on go get -v
|
||||
GOBUILD := GO111MODULE=on go build -v -trimpath
|
||||
GOINSTALL := GO111MODULE=on go install -v -trimpath
|
||||
GOTEST := GO111MODULE=on go test -v
|
||||
@ -71,21 +73,15 @@ $(GOVERALLS_BIN):
|
||||
|
||||
$(LINT_BIN):
|
||||
@$(call print, "Fetching linter")
|
||||
# Switch to tmp directory to prevent lnd go.mod from being modified.
|
||||
# Hopefully someday a flag for go get will be added for this.
|
||||
cd /tmp
|
||||
GO111MODULE=on go get $(LINT_PKG)
|
||||
$(DEPGET) $(LINT_PKG)@$(LINT_COMMIT)
|
||||
|
||||
$(GOACC_BIN):
|
||||
@$(call print, "Fetching go-acc")
|
||||
go get -u -v $(GOACC_PKG)@$(GOACC_COMMIT)
|
||||
$(GOINSTALL) $(GOACC_PKG)
|
||||
$(DEPGET) $(GOACC_PKG)@$(GOACC_COMMIT)
|
||||
|
||||
btcd:
|
||||
@$(call print, "Installing btcd.")
|
||||
GO111MODULE=on go get -v $(BTCD_PKG)@$(BTCD_COMMIT)
|
||||
$(GOINSTALL) $(BTCD_PKG)
|
||||
$(GOINSTALL) $(BTCD_PKG)/cmd/btcctl
|
||||
$(DEPGET) $(BTCD_PKG)@$(BTCD_COMMIT)
|
||||
|
||||
# ============
|
||||
# INSTALLATION
|
||||
|
Loading…
Reference in New Issue
Block a user