feat: use -trimpath to make builds more easily reproducible. Requires…

… go-ipfs >= 0.7.0

Makefile

@@ -4,16 +4,22 @@ GO111MODULE = on
 GOCC ?= go
 GOFLAGS ?=
 
-# make reproducable
-GOFLAGS += -asmflags=all=-trimpath="$(GOPATH)" -gcflags=all=-trimpath="$(GOPATH)"
-
 # If set, override the install location for plugins
 IPFS_PATH ?= $(HOME)/.ipfs
 
 # If set, override the IPFS version to build against. This _modifies_ the local
 # go.mod/go.sum files and permanently sets this version.
 IPFS_VERSION ?= $(lastword $(shell $(GOCC) list -m github.com/ipfs/go-ipfs))
 
+# make reproducible
+ifneq ($(findstring /,$(IPFS_VERSION)),)
+# Locally built go-ipfs
+GOFLAGS += -asmflags=all=-trimpath="$(GOPATH)" -gcflags=all=-trimpath="$(GOPATH)"
+else
+# Remote version of go-ipfs (e.g. via `go get -trimpath` or official distribution)
+GOFLAGS += -trimpath
+endif
+
 .PHONY: install build
 
 go.mod: FORCE

README.md

@@ -29,6 +29,7 @@ You can set `IPFS_VERSION` to:
 
 * `vX.Y.Z` to build against that version of IPFS.
 * `$commit` or `$branch` to build against a specific go-ipfs commit or branch.
+   * Note: if building against a commit or branch make sure to build that commit/branch using the -trimpath flag. For example getting the binary via `go get -trimpath github.com/ipfs/go-ipfs/cmd/ipfs@COMMIT`
 * `/absolute/path/to/source` to build against a specific go-ipfs checkout.
 
 To update the go-ipfs, run:

go.mod

@@ -3,8 +3,8 @@ module github.com/ipfs/go-ipfs-example-plugin
 go 1.12
 
 require (
-	github.com/ipfs/go-datastore v0.4.4
-	github.com/ipfs/go-ipfs v0.6.0
+	github.com/ipfs/go-datastore v0.4.5
+	github.com/ipfs/go-ipfs v0.7.0-rc2
 	github.com/ipfs/go-ipfs-delay v0.0.1
-	github.com/ipfs/interface-go-ipfs-core v0.3.0
+	github.com/ipfs/interface-go-ipfs-core v0.4.0
 )