Run just one container to build all exes

This commit is contained in:
Bryan Boreham committed 2016-06-06 11:43:08 +01:00
1 parent c6d1adf220
commit 39ba706a9b
2 files changed
+5 -4

No files matched your search

+3 -2
View File
@@ -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,))
+2 -2
View File
@@ -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: