diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-21 12:05:53 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-21 12:05:53 -0500 |
| commit | 1a9c01287c3921f10a6037d50fe2f08a2ae30d09 (patch) | |
| tree | 9819f22928af847657d1f1bf0b6c1bbb370d6b98 /Makefile | |
| parent | d9a2f1cf4d5f5a0fb5eed667e00ce45b78d33851 (diff) | |
| download | chat-1a9c01287c3921f10a6037d50fe2f08a2ae30d09.tar.gz chat-1a9c01287c3921f10a6037d50fe2f08a2ae30d09.tar.bz2 chat-1a9c01287c3921f10a6037d50fe2f08a2ae30d09.zip | |
Fixing travis
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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: |