mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 18:10:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3521 from cfromknecht/make-no-update

Browse Source 
Makefile: remove -u when installing go-acc, consolidate dep installation
This commit is contained in:
Olaoluwa Osuntokun 2019-09-18 16:37:13 -07:00 committed by GitHub
commit baa235c240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -4,7 +4,7 @@ MOBILE_PKG := $(PKG)/mobile
BTCD_PKG := github.com/btcsuite/btcd BTCD_PKG := github.com/btcsuite/btcd
GOVERALLS_PKG := github.com/mattn/goveralls 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 GOACC_PKG := github.com/ory/go-acc
GO_BIN := ${GOPATH}/bin GO_BIN := ${GOPATH}/bin
@ -30,8 +30,10 @@ BTCD_COMMIT := $(shell cat go.mod | \
awk -F " " '{ print $$2 }' | \ awk -F " " '{ print $$2 }' | \
awk -F "/" '{ print $$1 }') awk -F "/" '{ print $$1 }')
LINT_COMMIT := v1.18.0
GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5 GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
DEPGET := cd /tmp && GO111MODULE=on go get -v
GOBUILD := GO111MODULE=on go build -v -trimpath GOBUILD := GO111MODULE=on go build -v -trimpath
GOINSTALL := GO111MODULE=on go install -v -trimpath GOINSTALL := GO111MODULE=on go install -v -trimpath
GOTEST := GO111MODULE=on go test -v GOTEST := GO111MODULE=on go test -v
@ -71,21 +73,15 @@ $(GOVERALLS_BIN):
$(LINT_BIN): $(LINT_BIN):
@$(call print, "Fetching linter") @$(call print, "Fetching linter")
# Switch to tmp directory to prevent lnd go.mod from being modified. $(DEPGET) $(LINT_PKG)@$(LINT_COMMIT)
# Hopefully someday a flag for go get will be added for this.
cd /tmp
GO111MODULE=on go get $(LINT_PKG)
$(GOACC_BIN): $(GOACC_BIN):
@$(call print, "Fetching go-acc") @$(call print, "Fetching go-acc")
go get -u -v $(GOACC_PKG)@$(GOACC_COMMIT) $(DEPGET) $(GOACC_PKG)@$(GOACC_COMMIT)
$(GOINSTALL) $(GOACC_PKG)
btcd: btcd:
@$(call print, "Installing btcd.") @$(call print, "Installing btcd.")
GO111MODULE=on go get -v $(BTCD_PKG)@$(BTCD_COMMIT) $(DEPGET) $(BTCD_PKG)@$(BTCD_COMMIT)
$(GOINSTALL) $(BTCD_PKG)
$(GOINSTALL) $(BTCD_PKG)/cmd/btcctl
# ============ # ============
# INSTALLATION # INSTALLATION