diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-21 11:26:44 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-21 11:26:44 -0500 |
| commit | d2d75c8602e46b1288417b07f994b67d8503d068 (patch) | |
| tree | cd50ac7a72b8465f0fe5ebbea201d7dcbbca116d /Makefile | |
| parent | 5b2b5828903b70bafcd81d2f216a3770c1e05202 (diff) | |
| parent | c320bb4565231cd11ffd70851766059c867058da (diff) | |
| download | chat-d2d75c8602e46b1288417b07f994b67d8503d068.tar.gz chat-d2d75c8602e46b1288417b07f994b67d8503d068.tar.bz2 chat-d2d75c8602e46b1288417b07f994b67d8503d068.zip | |
Merge pull request #1841 from mattermost/auto-spinmint
Testing PR for auto spinmint.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -147,6 +147,8 @@ 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 + mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json + tar -C dist -czf $(DIST_PATH).tar.gz mattermost build-client: @@ -180,7 +182,7 @@ travis-init: if [ "$(TRAVIS_DB)" = "postgres" ]; then \ sed -i'.bak' 's|mysql|postgres|g' config/config.json; \ - sed -i'.bak' 's|mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8|postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable\&connect_timeout=10|g' config/config.json; \ + sed -i'.bak2' 's|mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8|postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable\&connect_timeout=10|g' config/config.json; \ fi if [ "$(TRAVIS_DB)" = "mysql" ]; then \ |