Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mk: fix make install by not setting GOBIN #6059

Merged
merged 1 commit into from
Mar 6, 2019
Merged

mk: fix make install by not setting GOBIN #6059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions coverage/Rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ include mk/header.mk
$(d)/coverage_deps: $$(DEPS_GO)
rm -rf $(@D)/unitcover && mkdir $(@D)/unitcover
rm -rf $(@D)/sharnesscover && mkdir $(@D)/sharnesscover

ifneq ($(IPFS_SKIP_COVER_BINS),1)
go install github.com/Kubuxu/gocovmerge
go install golang.org/x/tools/cmd/cover
$(d)/coverage_deps: test/bin/gocovmerge
endif

.PHONY: $(d)/coverage_deps

# unit tests coverage
Expand Down
8 changes: 0 additions & 8 deletions coverage/tools.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ require (
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
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/cheggaaa/pb.v1 v1.0.28
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
Expand Down
1 change: 0 additions & 1 deletion mk/golang.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ GOTFLAGS ?=

# match Go's default GOPATH behaviour
export GOPATH ?= $(shell $(GOCC) env GOPATH)
export GOBIN = $(abspath bin)

DEPS_GO :=
TEST_GO :=
Expand Down
4 changes: 4 additions & 0 deletions test/bin/Rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ $(d)/random-files:
$(call go-build,github.com/jbenet/go-random-files/random-files)
TGTS_$(d) += $(d)/random-files

$(d)/gocovmerge:
$(call go-build,github.com/Kubuxu/gocovmerge)
TGTS_$(d) += $(d)/gocovmerge


$(TGTS_$(d)): $$(DEPS_GO)

Expand Down
1 change: 1 addition & 0 deletions test/dependencies/dependencies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package tools

import (
_ "github.com/Kubuxu/gocovmerge"
_ "github.com/ipfs/go-cidutil/cid-fmt"
_ "github.com/ipfs/hang-fds"
_ "github.com/jbenet/go-random-files/random-files"
Expand Down