This commit is contained in:
jpellizzari
2017-02-13 12:01:11 -08:00
parent 3f597561a4
commit 336afe0f24
2 changed files with 6 additions and 6 deletions

View File

@@ -170,12 +170,12 @@ ui-upload: client/build-external/index.html
ui-build-pkg:
AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
$(sudo) docker run \
$(sudo) docker run --name scope-pkg \
-v $(shell pwd)/client/:/home/weave \
-v $(shell pwd)/tmp:/home/weave/tmp \
$(SCOPE_UI_BUILD_IMAGE) \
npm run bundle && \
aws s3 cp ./tmp/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/ --acl public-read
aws s3 cp ./tmp/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/weave-scope.tgz --acl public-read
clean:
$(GO) clean ./...

View File

@@ -39,12 +39,12 @@ dependencies:
test:
override:
- cd $SRCDIR; make RM= lint:
parallel: true
# - cd $SRCDIR; make RM= lint:
# parallel: true
# - cd $SRCDIR; COVERDIR=./coverage make RM= tests:
# parallel: true
# - cd $SRCDIR; make RM= client-test static:
# parallel: true
- cd $SRCDIR; make RM= client-test static:
parallel: true
# - cd $SRCDIR; make RM= client-lint static:
# parallel: true
# - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi: