From 4b0da099b58e8aaf03aa6f0a793a33171c9c14c0 Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Tue, 3 Apr 2018 11:09:49 -0500 Subject: [PATCH 1/2] Fix syntax on conditional check for docker-build config --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 824d23cad..9e2c6fa3f 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ build: vendor # Create a single release build under the build directory release-build: vendor - $(MAKE) $(if DOCKER_BUILD,docker-)build FLAGS="-o build/pilosa-$(VERSION_ID)/pilosa" + $(MAKE) $(if $(DOCKER_BUILD),docker-)build FLAGS="-o build/pilosa-$(VERSION_ID)/pilosa" cp LICENSE README.md build/pilosa-$(VERSION_ID) tar -cvz -C build -f build/pilosa-$(VERSION_ID).tar.gz pilosa-$(VERSION_ID)/ @echo Created release build: build/pilosa-$(VERSION_ID).tar.gz From 0bf5f089a0e14677f4b3806f1d8f114c526ca76b Mon Sep 17 00:00:00 2001 From: Cody Soyland Date: Tue, 3 Apr 2018 11:25:54 -0500 Subject: [PATCH 2/2] Run prerelease on Go 1.10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 715f81a6e..15c511e78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ deploy: skip_cleanup: true on: all_branches: true - go: 1.9 + go: "1.10" matrix: allow_failures: - go: master