summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-01-08 12:05:42 -0500
committerChristopher Speller <crspeller@gmail.com>2016-01-21 09:31:05 -0500
commitc320bb4565231cd11ffd70851766059c867058da (patch)
treea447e41dfb4c5dce63b7b9a5a6472d0ccb3e266b /Makefile
parent5e9dde6a4cdec89bbc234830c7bd17a717f29baf (diff)
downloadchat-c320bb4565231cd11ffd70851766059c867058da.tar.gz
chat-c320bb4565231cd11ffd70851766059c867058da.tar.bz2
chat-c320bb4565231cd11ffd70851766059c867058da.zip
Adding curl to upload pr builds
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9fd74b959..2b12a6a56 100644
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,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:
@@ -179,7 +181,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 \