From 39ba706a9b2b6c8ca555d10c788604a8f4cc87bd Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sun, 5 Jun 2016 11:01:29 +0100 Subject: [PATCH] Run just one container to build all exes --- Makefile | 5 +++-- circle.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 139b1d91..11dd4e15 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,6 @@ BUILD_FLAGS=-i -ldflags "-extldflags \"-static\" -X main.version=$(WEAVE_VERSION PACKAGE_BASE=$(shell go list -e ./) all: $(WEAVE_EXPORT) -exes: $(EXES) testrunner: $(RUNNER_EXE) $(TEST_TLS_EXE) $(EXES): $(BUILD_UPTODATE) @@ -79,7 +78,7 @@ lint: $(BUILD_UPTODATE) tools/.git ifeq ($(BUILD_IN_CONTAINER),true) -$(EXES) tests lint: +exes $(EXES) tests lint: git submodule update --init @mkdir -p $(shell pwd)/.pkg $(SUDO) docker run $(RM) $(RUN_FLAGS) \ @@ -90,6 +89,8 @@ $(EXES) tests lint: else +exes: $(EXES) + $(WEAVER_EXE) $(WEAVEPROXY_EXE) $(PLUGIN_EXE): ifeq ($(COVERAGE),true) $(eval COVERAGE_MODULES := $(shell (go list ./$(@D); go list -f '{{join .Deps "\n"}}' ./$(@D) | grep "^$(PACKAGE_BASE)/") | grep -v "^$(PACKAGE_BASE)/vendor/" | paste -s -d,)) diff --git a/circle.yml b/circle.yml index ffc158f0..528488cf 100644 --- a/circle.yml +++ b/circle.yml @@ -32,7 +32,7 @@ test: parallel: true - cd $SRCDIR; COVERDIR=test/coverage make RM= tests: parallel: true - - cd $SRCDIR; make COVERAGE=true RM= all: + - cd $SRCDIR; make COVERAGE=true RM= exes all: parallel: true - cd $SRCDIR; make testrunner: parallel: true @@ -67,7 +67,7 @@ deployment: commands: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS - cd $SRCDIR; make clean-bin - - cd $SRCDIR; make publish + - cd $SRCDIR; make exes publish # - go get github.com/weaveworks/wordepress && cd /home/ubuntu/src/github.com/weaveworks/wordepress && git checkout v1.0.0 && cd cmd/wordepress && go get # - cd $SRCDIR; bin/publish-site "$WP_DEV_URL" "$WP_DEV_USER" "$WP_DEV_PASSWORD" # issues: