From bc6f98d144c8bb2e144d5dbbb273295777f52e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Thu, 7 Dec 2017 20:50:03 +0100 Subject: [PATCH 1/4] badger: Update to fix i386 windows build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera --- package.json | 4 ++-- repo/fsrepo/datastores.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1ec32061b..bf9b3142d 100644 --- a/package.json +++ b/package.json @@ -470,9 +470,9 @@ }, { "author": "magik6k", - "hash": "QmPhe5Agy6FW8nyFXdphtAVPrmmPFN18pCrtpnRzMWa4Vi", + "hash": "Qmdin8YL17fL1BC5ej6o9b8es6MBoiQjKVdyxEwJh3HVmf", "name": "go-ds-badger", - "version": "1.2.0" + "version": "1.3.0" }, { "author": "whyrusleeping", diff --git a/repo/fsrepo/datastores.go b/repo/fsrepo/datastores.go index 086cea6a6..d2ad79804 100644 --- a/repo/fsrepo/datastores.go +++ b/repo/fsrepo/datastores.go @@ -16,9 +16,9 @@ import ( ds "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore" mount "gx/ipfs/QmdHG8MAuARdGHxx4rPQASLcvhz24fzjSQq7AJRAQEorq5/go-datastore/syncmount" - badgerds "gx/ipfs/QmPhe5Agy6FW8nyFXdphtAVPrmmPFN18pCrtpnRzMWa4Vi/go-ds-badger" levelds "gx/ipfs/QmYnCBXxoyoS38vtNQjjpRwZTiUnpuuKpapxMNaDfyQRLf/go-ds-leveldb" ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt" + badgerds "gx/ipfs/Qmdin8YL17fL1BC5ej6o9b8es6MBoiQjKVdyxEwJh3HVmf/go-ds-badger" ) // ConfigFromMap creates a new datastore config from a map From bf30549370586f77992094b7bc590fb5dccf8f85 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 7 Dec 2017 11:59:29 -0800 Subject: [PATCH 2/4] enable build test for windows i386 closes #4438 License: MIT Signed-off-by: Steven Allen --- mk/util.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/util.mk b/mk/util.mk index c531d9123..449d6aa15 100644 --- a/mk/util.mk +++ b/mk/util.mk @@ -9,7 +9,7 @@ else PATH_SEP :=: endif -# SUPPORTED_PLATFORM += windows/386 FIXME: #4438 (badger bug) +SUPPORTED_PLATFORMS += windows-386 SUPPORTED_PLATFORMS += windows-amd64 SUPPORTED_PLATFORMS += linux-arm From f3ad2c95bdcac987bfe2485fde72d63a2f0f4104 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 7 Dec 2017 13:43:52 -0800 Subject: [PATCH 3/4] run os builds as a part of the test_go_* targets We were doing this as part of the `test` target but we don't run that on CI (or at least not on Travis). License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/Rules.mk | 2 +- mk/golang.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/ipfs/Rules.mk b/cmd/ipfs/Rules.mk index a42b12a92..360a66fb6 100644 --- a/cmd/ipfs/Rules.mk +++ b/cmd/ipfs/Rules.mk @@ -2,7 +2,7 @@ include mk/header.mk IPFS_BIN_$(d) := $(call go-curr-pkg-tgt) TGT_BIN += $(IPFS_BIN_$(d)) -TEST += $(d)-try-build +TEST_GO_BUILD += $(d)-try-build CLEAN += $(IPFS_BIN_$(d)) PATH := $(realpath $(d)):$(PATH) diff --git a/mk/golang.mk b/mk/golang.mk index 82158e507..5a08d0e58 100644 --- a/mk/golang.mk +++ b/mk/golang.mk @@ -9,6 +9,7 @@ GOTFLAGS ?= DEPS_GO := TEST_GO := +TEST_GO_BUILD := CHECK_GO := go-pkg-name=$(shell $(GOCC) list $(go-tags) github.com/ipfs/go-ipfs/$(1)) @@ -35,7 +36,7 @@ test_go_race: GOTFLAGS += -race test_go_race: test_go_expensive .PHONY: test_go_race -test_go_expensive: $$(DEPS_GO) +test_go_expensive: $$(TEST_GO_BUILD) $$(DEPS_GO) $(GOCC) test $(go-flags-with-tags) $(GOTFLAGS) ./... .PHONY: test_go_expensive TEST_GO += test_go_expensive From ddcf5ad9c172e44d620eddef34897db3b7ccf6f3 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 8 Dec 2017 14:49:50 -0800 Subject: [PATCH 4/4] make: don't use the private modifier 1. We don't need it (technically). 2. TravisCI (well, Ubuntu Trusty) is using a 11 year old version of make without support for this feature. License: MIT Signed-off-by: Steven Allen --- cmd/ipfs/Rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/ipfs/Rules.mk b/cmd/ipfs/Rules.mk index 360a66fb6..175b098ee 100644 --- a/cmd/ipfs/Rules.mk +++ b/cmd/ipfs/Rules.mk @@ -25,9 +25,9 @@ TRY_BUILD_$(d)=$(addprefix $(d)-try-build-,$(SUPPORTED_PLATFORMS)) $(d)-try-build: $(TRY_BUILD_$(d)) .PHONY: $(d)-try-build -$(TRY_BUILD_$(d)): private PLATFORM = $(subst -, ,$(patsubst $<-try-build-%,%,$@)) -$(TRY_BUILD_$(d)): private GOOS = $(word 1,$(PLATFORM)) -$(TRY_BUILD_$(d)): private GOARCH = $(word 2,$(PLATFORM)) +$(TRY_BUILD_$(d)): PLATFORM = $(subst -, ,$(patsubst $<-try-build-%,%,$@)) +$(TRY_BUILD_$(d)): GOOS = $(word 1,$(PLATFORM)) +$(TRY_BUILD_$(d)): GOARCH = $(word 2,$(PLATFORM)) $(TRY_BUILD_$(d)): $(d) $$(DEPS_GO) ALWAYS GOOS=$(GOOS) GOARCH=$(GOARCH) $(go-try-build) .PHONY: $(TRY_BUILD_$(d))