opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-08-06 19:44:01 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6059 from ipfs/fix/make-build

Browse Source 
mk: fix make install by not setting GOBIN
This commit is contained in:
Steven Allen
2019-03-06 13:31:23 -08:00
committed by GitHub
parent e375224c3c 061128d1d3
commit cc315dc77f
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coverage/Rules.mk
View File

@ -3,10 +3,11 @@ include mk/header.mk
$(d)/coverage_deps: $$(DEPS_GO) $(d)/coverage_deps: $$(DEPS_GO)
rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover
rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover
ifneq ($(IPFS_SKIP_COVER_BINS),1) ifneq ($(IPFS_SKIP_COVER_BINS),1)
go install github.com/Kubuxu/gocovmerge $(d)/coverage_deps: test/bin/gocovmerge
go install golang.org/x/tools/cmd/cover
endif endif
.PHONY: $(d)/coverage_deps .PHONY: $(d)/coverage_deps
# unit tests coverage # unit tests coverage

8
coverage/tools.go
View File

@ -1,8 +0,0 @@
// +build tools
package coverage
import (
_ "github.com/Kubuxu/gocovmerge"
_ "golang.org/x/tools/cmd/cover"
)

1
go.mod
View File

@ -108,7 +108,6 @@ require (
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 golang.org/x/sys v0.0.0-20190302025703-b6889370fb10
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 gopkg.in/cheggaaa/pb.v1 v1.0.28
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect

1
mk/golang.mk
View File

@ -12,7 +12,6 @@ GOTFLAGS ?=
# match Go's default GOPATH behaviour # match Go's default GOPATH behaviour
export GOPATH ?= $(shell $(GOCC) env GOPATH) export GOPATH ?= $(shell $(GOCC) env GOPATH)
export GOBIN = $(abspath bin)
DEPS_GO := DEPS_GO :=
TEST_GO := TEST_GO :=

4
test/bin/Rules.mk
View File

@ -50,6 +50,10 @@ $(d)/random-files:
$(call go-build,github.com/jbenet/go-random-files/random-files) $(call go-build,github.com/jbenet/go-random-files/random-files)
TGTS_$(d) += $(d)/random-files TGTS_$(d) += $(d)/random-files
$(d)/gocovmerge:
$(call go-build,github.com/Kubuxu/gocovmerge)
TGTS_$(d) += $(d)/gocovmerge
$(TGTS_$(d)): $$(DEPS_GO) $(TGTS_$(d)): $$(DEPS_GO)

1
test/dependencies/dependencies.go
View File

@ -3,6 +3,7 @@
package tools package tools
import ( import (
_ "github.com/Kubuxu/gocovmerge"
_ "github.com/ipfs/go-cidutil/cid-fmt" _ "github.com/ipfs/go-cidutil/cid-fmt"
_ "github.com/ipfs/hang-fds" _ "github.com/ipfs/hang-fds"
_ "github.com/jbenet/go-random-files/random-files" _ "github.com/jbenet/go-random-files/random-files"