Fixing travis

This commit is contained in:
Christopher Speller
2016-01-21 12:05:53 -05:00
parent d9a2f1cf4d
commit 1a9c01287c

View File

@@ -42,6 +42,7 @@ dist: | build-server build-client go-test package
dist-local: | start-docker dist
dist-travis: | travis-init build-container
mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json;
start-docker:
@echo Starting docker containers
@@ -147,10 +148,6 @@ package:
sed -i'.bak' 's|libs.min.js|libs-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html
rm $(DIST_PATH)/web/templates/*.bak
if [ "$(TRAVIS_DB)" != "" ]; then \
mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json; \
fi
tar -C dist -czf $(DIST_PATH).tar.gz mattermost
build-client: